Skip to content

sibu-v-mall / sibu-v-mall-third-api

转到一个项目
切换导航栏
切换导航栏固定状态
9f40cc93 由 lauka
选项

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

1 个父辈 b4e3396d
内嵌 并排
正在显示 2 个修改的文件 包含 4 行增加 和 2 行删除
...@@ -57,6 +57,7 @@ ...@@ -57,6 +57,7 @@
57 <result property="moneyIntegral" column="money_integral" /> 57 <result property="moneyIntegral" column="money_integral" />
58 <result property="payTime" column="pay_time" /> 58 <result property="payTime" column="pay_time" />
59 <result property="couponMoney" column="couponMoney" /> 59 <result property="couponMoney" column="couponMoney" />
60 <result property="moneyDiscount" column="money_discount" />
60 </resultMap> 61 </resultMap>
61 62
62 <!-- 根据订单号查询订单信息 只查询不是主订单的订单 --> 63 <!-- 根据订单号查询订单信息 只查询不是主订单的订单 -->
...@@ -153,7 +154,7 @@ ...@@ -153,7 +154,7 @@
153 <select id="getOrdersList" parameterType="java.util.Map" resultMap="orders"> 154 <select id="getOrdersList" parameterType="java.util.Map" resultMap="orders">
154 select o.order_sn,o.order_state,o.remark,o.create_time,p.regionName AS regionName1, 155 select o.order_sn,o.order_state,o.remark,o.create_time,p.regionName AS regionName1,
155 c.regionName AS regionName2,a.regionName AS regionName3, 156 c.regionName AS regionName2,a.regionName AS regionName3,
156 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, 157 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,
157 o.money_order,o.money_product,o.pay_time,o.member_name FROM orders o 158 o.money_order,o.money_product,o.pay_time,o.member_name FROM orders o
158 LEFT JOIN regions p ON p.id = o.province_id 159 LEFT JOIN regions p ON p.id = o.province_id
159 LEFT JOIN regions c ON c.id = o.city_id 160 LEFT JOIN regions c ON c.id = o.city_id
......
...@@ -136,9 +136,10 @@ public class GetOrderBizServiceImpl extends AbstractBizService<GetOrderRequest> ...@@ -136,9 +136,10 @@ public class GetOrderBizServiceImpl extends AbstractBizService<GetOrderRequest>
136 orderResponse.setPhone(orders.getMobile());//电话 136 orderResponse.setPhone(orders.getMobile());//电话
137 orderResponse.setMobile(orders.getMobile()); 137 orderResponse.setMobile(orders.getMobile());
138 orderResponse.setPostFee(this.convertAndCheckFreight(orders.getMoneyLogistics()));//邮费 138 orderResponse.setPostFee(this.convertAndCheckFreight(orders.getMoneyLogistics()));//邮费
139 log.info("******"+orders.getMoneyProduct());
139 orderResponse.setGoodsFee(this.convertAndCheckFreight(orders.getMoneyProduct()));//货款金额 140 orderResponse.setGoodsFee(this.convertAndCheckFreight(orders.getMoneyProduct()));//货款金额
140 orderResponse.setTotalMoney(this.convertAndCheckFreight(orders.getMoneyOrder()));//支付金额 141 orderResponse.setTotalMoney(this.convertAndCheckFreight(orders.getMoneyOrder()));//支付金额
141 orderResponse.setFavourableMoney(this.convertAndCheckFreight(orders.getCouponMoney()));//优惠金额 142 orderResponse.setFavourableMoney(this.convertAndCheckFreight(orders.getMoneyDiscount()));//优惠金额
142 orderResponse.setPayTime(orders.getPayTime()==null?"":this.buildDefaultSimpleDateFormat().format(orders.getPayTime()));//支付时间 143 orderResponse.setPayTime(orders.getPayTime()==null?"":this.buildDefaultSimpleDateFormat().format(orders.getPayTime()));//支付时间
143 orderResponse.setShouldPayType("银行收款");//结算方式 144 orderResponse.setShouldPayType("银行收款");//结算方式
144 orderResponse.setTown(""); 145 orderResponse.setTown("");
......