菠萝派接口-订单下载查询优惠金额修改

@@ -57,6 +57,7 @@
 		<result property="moneyIntegral" column="money_integral" />
 		<result property="payTime" column="pay_time" />
 		<result property="couponMoney" column="couponMoney" />
+		<result property="moneyDiscount" column="money_discount" />
 	</resultMap>
 
 	<!-- 根据订单号查询订单信息  只查询不是主订单的订单 -->
@@ -153,7 +154,7 @@
 	<select id="getOrdersList" parameterType="java.util.Map"  resultMap="orders">
 		select o.order_sn,o.order_state,o.remark,o.create_time,p.regionName AS regionName1,
 		c.regionName AS regionName2,a.regionName AS regionName3,
-		o.address_info,o.mobile,o.zip_code,o.zip_code,o.money_logistics,o.money_product-o.money_order+o.money_logistics AS couponMoney,
+		o.address_info,o.mobile,o.zip_code,o.zip_code,o.money_logistics,o.money_product-o.money_order+o.money_logistics AS couponMoney,o.money_discount,
 		o.money_order,o.money_product,o.pay_time,o.member_name FROM orders  o
 		LEFT JOIN regions p ON p.id = o.province_id
 		LEFT JOIN regions c ON c.id = o.city_id

@@ -136,9 +136,10 @@ public class GetOrderBizServiceImpl extends AbstractBizService<GetOrderRequest>
         orderResponse.setPhone(orders.getMobile());//电话
         orderResponse.setMobile(orders.getMobile());
         orderResponse.setPostFee(this.convertAndCheckFreight(orders.getMoneyLogistics()));//邮费
+        log.info("******"+orders.getMoneyProduct());
         orderResponse.setGoodsFee(this.convertAndCheckFreight(orders.getMoneyProduct()));//货款金额
         orderResponse.setTotalMoney(this.convertAndCheckFreight(orders.getMoneyOrder()));//支付金额
-        orderResponse.setFavourableMoney(this.convertAndCheckFreight(orders.getCouponMoney()));//优惠金额
+        orderResponse.setFavourableMoney(this.convertAndCheckFreight(orders.getMoneyDiscount()));//优惠金额
         orderResponse.setPayTime(orders.getPayTime()==null?"":this.buildDefaultSimpleDateFormat().format(orders.getPayTime()));//支付时间
         orderResponse.setShouldPayType("银行收款");//结算方式
         orderResponse.setTown("");