菠萝派接口-订单下载，修改子订单优惠金额不正确

@@ -257,7 +257,7 @@
 		where do.main_order_code=#{mainOrderCode} AND do.delete_flag=1 and do.order_from=#{orderFrom}
 		where do.main_order_code=#{mainOrderCode} AND do.delete_flag=1 and do.order_from=#{orderFrom}
 	</select>
 	</select>
 	<select id="getIMOrderDetailByOrderCode" parameterType="map" resultMap="oneIMOrderDetailColumn">
 	<select id="getIMOrderDetailByOrderCode" parameterType="map" resultMap="oneIMOrderDetailColumn">
-		select <include refid="Select_DoingOrder_column"/>,do.transaction_id
+		select <include refid="Select_DoingOrder_column"/>,do.transaction_id,do1.deduction_line_coupon_price,do1.deduction_line_vb_price
 
 
 		from ${doingOrderTable} do left join ${doingOrder1Table} do1
 		from ${doingOrderTable} do left join ${doingOrder1Table} do1
 		on do.order_id=do1.order_id
 		on do.order_id=do1.order_id
@@ -384,6 +384,8 @@
 			<result column="discount_line_price" property="discountLinePrice" />
 			<result column="discount_line_price" property="discountLinePrice" />
 			<result column="deduction_product_vb" property="deductionProductVb" />
 			<result column="deduction_product_vb" property="deductionProductVb" />
 			<result column="deduction_line_vb" property="deductionLineVb" />
 			<result column="deduction_line_vb" property="deductionLineVb" />
+			<result column="deduction_line_coupon_price" property="deductionLineCouponPrice" />
+			<result column="deduction_line_vb_price" property="deductionLineVbPrice" />
 			<result column="refund_status" property="refundStatus" />
 			<result column="refund_status" property="refundStatus" />
 			<result column="sort_index" property="sortIndex" />
 			<result column="sort_index" property="sortIndex" />
 			<result column="product_share_percentage" property="productSharePercentage" />
 			<result column="product_share_percentage" property="productSharePercentage" />

@@ -56,6 +56,10 @@ public class DoingOrder1DetailResponse implements Serializable {
     @JSONField(serialize = false)
     @JSONField(serialize = false)
     private RefundOperateTypeEnum refundOperateTypeEnum;
     private RefundOperateTypeEnum refundOperateTypeEnum;
 
 
+    private BigDecimal deductionLineCouponPrice;
+
+    private BigDecimal deductionLineVbPrice;
+
     public Integer getRefundOperateTypeCode() {
     public Integer getRefundOperateTypeCode() {
         if (refundOperateTypeEnum != null) {
         if (refundOperateTypeEnum != null) {
             return refundOperateTypeEnum.getCode();
             return refundOperateTypeEnum.getCode();
@@ -290,4 +294,20 @@ public class DoingOrder1DetailResponse implements Serializable {
     public void setProductSharePercentage(BigDecimal productSharePercentage) {
     public void setProductSharePercentage(BigDecimal productSharePercentage) {
         this.productSharePercentage = productSharePercentage;
         this.productSharePercentage = productSharePercentage;
     }
     }
+
+    public BigDecimal getDeductionLineCouponPrice() {
+        return deductionLineCouponPrice;
+    }
+
+    public void setDeductionLineCouponPrice(BigDecimal deductionLineCouponPrice) {
+        this.deductionLineCouponPrice = deductionLineCouponPrice;
+    }
+
+    public BigDecimal getDeductionLineVbPrice() {
+        return deductionLineVbPrice;
+    }
+
+    public void setDeductionLineVbPrice(BigDecimal deductionLineVbPrice) {
+        this.deductionLineVbPrice = deductionLineVbPrice;
+    }
 }
 }

@@ -34,7 +34,9 @@ public class PlatformOrderItemToPineAppleOrderItemConverter implements Converter
         target.setTradeGoodsSpec(source.getSpecDetail());
         target.setTradeGoodsSpec(source.getSpecDetail());
         target.setGoodsCount(source.getPurchaseQuantity().toString());
         target.setGoodsCount(source.getPurchaseQuantity().toString());
         target.setPrice(source.getPrice().toPlainString());
         target.setPrice(source.getPrice().toPlainString());
-        target.setDiscountMoney(source.getDiscountPrice() == null ? "0" : source.getDiscountPrice().toPlainString());
+        BigDecimal discountPrice = source.getDeductionLineCouponPrice() == null ?BigDecimal.ZERO: source.getDeductionLineCouponPrice();
+        BigDecimal discountLineVbPrice =source.getDeductionLineVbPrice() == null? BigDecimal.ZERO:source.getDeductionLineVbPrice();
+        target.setDiscountMoney(discountPrice.add(discountLineVbPrice).toString());
         target.setTaxAmount("");
         target.setTaxAmount("");
         target.setRefundStatus("");
         target.setRefundStatus("");
         target.setStatus("");
         target.setStatus("");

@@ -64,7 +64,7 @@ public class PlatformOrderToPineAppleOrderConverter implements Converter<DoingOr
         target.setCurrencyCode("");
         target.setCurrencyCode("");
         target.setIdCard("");
         target.setIdCard("");
         target.setIdCardTrueName("");
         target.setIdCardTrueName("");
-        target.setReceiverName("");
+        target.setReceiverName(source.getContact());
         target.setNick(source.getBuyerUsername());
         target.setNick(source.getBuyerUsername());
         target.setWhseCode("");
         target.setWhseCode("");
         target.setIsHwgFlag("");
         target.setIsHwgFlag("");