Merge branch 'master' of hyq/ccnet-wx-mp3.0 into master

src/main/java/com/emato/ccnet/wx/biz/req/waybill/oms/Ceb511Response.java

@@ -151,7 +151,8 @@ public class Ceb511Response {
             cusWaybillStatus.setSendStatus(Contants.SUCCESS_STATUS);
             wxOrder.setPlayOrderStatus(WmContants.wmStatuses.item_2.getItem());
             cusWaybillStatus.setRespStatus(Contants.SUCCESS_STATUS);
-            Map<String, Object> recordMap = ImmutableMap.of("orderSn", wxOrder.getOrderSn(), "shipmentStartTime",new Date());
+            Map<String, Object> recordMap = ImmutableMap.of("orderSn", wxOrder.getOrderSn(), "shipmentStartTime", new Date(),
+                    "shipmentSuccTime", new Date());
             wxOrderGrabService.updateMallOrderProcessRecord(recordMap);
 
         }else{

src/main/java/com/emato/ccnet/wx/contants/CcnetContants.java

@@ -242,7 +242,7 @@ public class CcnetContants {
     public enum serviceStates {
         item_2("2", "成功"),
         item_3("3", "失败"),
-        item_4("4", "成功"),;
+        item_4("4", "订单缺失"),;
 
         private String item;
         private String itemName;

src/main/java/com/emato/ccnet/wx/service/impl/CusOrderServiceImpl.java

@@ -115,13 +115,13 @@ public class CusOrderServiceImpl implements CusOrderService {
                     return 0;
                 }
 
-                BigDecimal goodsValue = null;
+                BigDecimal goodsValue = new BigDecimal(0);
                 int i = 1;
                 //电子订单商品表
                 for (WxOrderGoods wxOrderGoods:orderGoodsList) {
                     CusOrderGoods cusOrderGoods = buildCusOrderGoods(wxOrderGoods, bill.getCusOrderSn(), i);
                     i++;
-                    goodsValue = cusOrderGoods.getTotalPrice();
+                    goodsValue = goodsValue.add(cusOrderGoods.getTotalPrice());
                     cusOrderGoodes.add(cusOrderGoods);
                 }
 
@@ -149,13 +149,13 @@ public class CusOrderServiceImpl implements CusOrderService {
                     return 0;
                 }
 
-                BigDecimal goodsValue = null;
+                BigDecimal goodsValue = new BigDecimal(0);
                 int i = 1;
                 //电子订单商品表
                 for (WxOrderGoods wxOrderGoods:orderGoodsList) {
                     CusOrderGoods cusOrderGoods = buildCusOrderGoods(wxOrderGoods, cusOrderSn, i);
                     i++;
-                    goodsValue = cusOrderGoods.getTotalPrice();
+                    goodsValue = goodsValue.add(cusOrderGoods.getTotalPrice());
                     cusOrderGoodes.add(cusOrderGoods);
                 }
                 //电子订单表

src/main/java/com/emato/ccnet/wx/service/impl/WxOrderServiceImpl.java

@@ -167,6 +167,13 @@ public class WxOrderServiceImpl implements WxOrderService {
                                 return;
                             });
                         }
+                        if(StringUtils.isEmpty(wxOrder.getConsigneeDistrictCode())){//如为空则设置为市区
+                            wxOrder.setConsigneeDistrictCode(itemDivi.get("diviCode").toString());
+                        }
+                        if(StringUtils.isEmpty(wxOrder.getConsigneeDistrict())){//如为空则设置为市区
+                            wxOrder.setConsigneeAddress(wxOrder.getConsigneeDistrict()+wxOrder.getConsigneeAddress());
+                            wxOrder.setConsigneeDistrict(wxOrder.getConsigneeCity());
+                        }
                         return;
                     }
                 });

src/main/resources/mybatis/mapper/wx/WxOrderGrab.xml

@@ -140,6 +140,9 @@
         <if test="shipmentStartTime != null" >
           shipment_start_time = #{shipmentStartTime,jdbcType=VARCHAR},
         </if>
+        <if test="shipmentSuccTime != null" >
+          shipment_succ_time = #{shipmentSuccTime,jdbcType=VARCHAR},
+        </if>
         <if test="logisticsNo != null">
           logistics_no = #{logisticsNo},
         </if>