Merge remote-tracking branch 'upsteam/master'

src/main/java/com/emato/ccnet/biz/req/order/csp/Ceb311CustiomsResponse.java

@@ -50,6 +50,7 @@ public class Ceb311CustiomsResponse implements CebCustomsResponse{
             return;
         }
         String orderSn = orderDto.getOrderSn();
+        String orderNo = orderDto.getOrderNo();
 
         //查找电子订单
         CusOrder cusOrder = cusOrderService.findCusOrder(orderSn);
@@ -76,13 +77,13 @@ public class Ceb311CustiomsResponse implements CebCustomsResponse{
         //对响应的数据进行处理
         if(Contants.ORDER_RESPONSE_SUCCESS.equals(orderCustiomsResponse.getCode())){
             cusOrderStatus.setSendStatus(Contants.SUCCESS_STATUS);
-            Map<String, Object> kmallMap = ImmutableMap.of("orderNo", orderSn, "cusOrderFlag", Contants.SUCCESS_STATUS);
+            Map<String, Object> kmallMap = ImmutableMap.of("orderNo", orderNo, "cusOrderFlag", Contants.SUCCESS_STATUS);
             kmallOrderService.updateCusKmallOrderStatus(kmallMap);
         }
 
         if(Contants.ORDER_RESPONSE_FAIL.equals(orderCustiomsResponse.getCode())){
             cusOrderStatus.setSendStatus(Contants.FAIL_STATUS);
-            Map<String, Object> kmallMap = ImmutableMap.of("orderNo", orderSn, "cusOrderFlag", Contants.FAIL_STATUS);
+            Map<String, Object> kmallMap = ImmutableMap.of("orderNo", orderNo, "cusOrderFlag", Contants.FAIL_STATUS);
             kmallOrderService.updateCusKmallOrderStatus(kmallMap);
         }
 

src/main/resources/mybatis/mapper/kmall/kmall_order.xml

@@ -76,7 +76,7 @@
         <result property="orderNo" column="order_no"/>
         <result property="goodsNo" column="goods_no"/>
         <result property="goodsNums" column="goods_nums"/>
-        <result property="sellPrice" column="sell_price"/>
+        <result property="sellPrice" column="cost_price"/>
 
         <result property="sellTotalPice" column="sell_total_pice"/>
         <result property="name" column="name"/>
@@ -140,8 +140,8 @@
 
     <!--商品详情-->
     <select id="getOrderGoods" parameterType="java.lang.String" resultMap="orderGoods">
-        SELECT t.order_no, t2.goods_no, t2.sell_price,t1.goods_nums,
-        t2.sell_price*t1.goods_nums AS sell_total_pice, t2.name,t2.content
+        SELECT t.order_no, t2.goods_no, t2.cost_price,t1.goods_nums,
+        t2.cost_price*t1.goods_nums AS sell_total_pice, t2.name,t2.content
         FROM iwebshop_order t
         LEFT OUTER JOIN iwebshop_order_goods t1 ON t.id=t1.order_id
         LEFT OUTER JOIN iwebshop_goods t2 ON t1.goods_id=t2.id