微信多小程序处理，代服管家物流状态处理

fs-service/src/main/java/com/fs/erp/service/impl/DfOrderServiceImpl.java

@@ -266,35 +266,79 @@ public class DfOrderServiceImpl implements IErpOrderService
                 String jsonString = JSON.toJSONString(dfApiResponse.getResult());
 //                List<DFOrderStatusResultRequest> requestList = JSON.parseArray(jsonString, DFOrderStatusResultRequest.class);
                 DFOrderStatusResultRequest temp = JSON.parseObject(jsonString, DFOrderStatusResultRequest.class);
-//                if (requestList != null && !requestList.isEmpty()){
-                    //0待揽收 1已揽收 2运输中 3派送中 4异常件 5退回件 6退回签收 7转寄件 8作废件 9已签收 10 已取消
-//                    for (DFOrderStatusResultRequest temp : requestList) {
-                        if (temp.getStatus() == 10){
-                            //取消订单
-                            String mailNumber = temp.getMailNumber();
-                            List<FsStoreOrder> fsStoreOrders = fsStoreOrderMapper.selectFsStoreOrderListByDeliverySn(mailNumber);
-                            if (fsStoreOrders != null && !fsStoreOrders.isEmpty()){
-                                fsStoreOrders.forEach(tempOrder -> {
-                                    FsStoreOrderSalesParam afterSalesParam = new FsStoreOrderSalesParam();
-                                    afterSalesParam.setOrderId(tempOrder.getOrderId());
-                                    afterSalesParam.setReasons("代服管家取消订单");
-                                    afterSalesParam.setOperator("代服管家");
-                                    fsStoreOrderService.afterSales(afterSalesParam);
-                                    FsStoreOrderDf df = new FsStoreOrderDf();
-                                    df.setOrderId(order.getOrderId());
-                                    df.setStatus(2);
-                                    df.setUpdateTime(new Date());
-                                    fsStoreOrderDfMapper.updateFsStoreOrderDf(df);
-                                    log.info("代服管家 订单取消成功: {}", response);
-                                });
-                            }
-                        } else if (temp.getStatus() == 9){
-                            //已签收
-                            fsStoreOrderService.getGoods(order.getOrderId());
+                //0待揽收 1已揽收 2运输中 3派送中 4异常件 5退回件 6退回签收 7转寄件 8作废件 9已签收 10 已取消
+                Integer deliveryStatus = 0;
+                String stateEx = "0";
+                FsStoreOrder fsStoreOrderMap = new FsStoreOrder();
+                fsStoreOrderMap.setOrderId(order.getOrderId());
+                Integer status = temp.getStatus();
+                switch (status) {
+                    case 0:
+                        //0待揽收 1已揽收 2运输中
+                        deliveryStatus = status;
+                        stateEx = status.toString();
+                        break;
+                    case 1:
+                        //0待揽收 1已揽收 2运输中
+                        deliveryStatus = status;
+                        stateEx = status.toString();
+                        break;
+                    case 2:
+                        //0待揽收 1已揽收 2运输中
+                        deliveryStatus = status;
+                        stateEx = status.toString();
+                        break;
+                    case 3:
+                        //3派送中
+                        deliveryStatus = 2;
+                        stateEx = "202";
+                        break;
+                    case 4:
+                        // 4异常件
+                        deliveryStatus = status;
+                        stateEx = status.toString();
+                        break;
+                    case 5:
+                        //5退回件
+                        deliveryStatus = 4;
+                        stateEx = "407"; //退货未签收
+                        break;
+                    case 6:
+                        // 6退回签收 7转寄件 8作废件 9已签收 10 已取消
+                        deliveryStatus = status;
+                        stateEx = "406"; //退货签收
+                        break;
+                    case 9:
+                        //已签收
+                        deliveryStatus = 3;
+                        stateEx = "301"; //退货签收
+                        fsStoreOrderService.getGoods(order.getOrderId());
+                        break;
+                    case 10:
+                        //取消订单
+                        String mailNumber = temp.getMailNumber();
+                        List<FsStoreOrder> fsStoreOrders = fsStoreOrderMapper.selectFsStoreOrderListByDeliverySn(mailNumber);
+                        if (fsStoreOrders != null && !fsStoreOrders.isEmpty()) {
+                            fsStoreOrders.forEach(tempOrder -> {
+                                FsStoreOrderSalesParam afterSalesParam = new FsStoreOrderSalesParam();
+                                afterSalesParam.setOrderId(tempOrder.getOrderId());
+                                afterSalesParam.setReasons("代服管家取消订单");
+                                afterSalesParam.setOperator("代服管家");
+                                fsStoreOrderService.afterSales(afterSalesParam);
+                                FsStoreOrderDf df = new FsStoreOrderDf();
+                                df.setOrderId(order.getOrderId());
+                                df.setStatus(2);
+                                df.setUpdateTime(new Date());
+                                fsStoreOrderDfMapper.updateFsStoreOrderDf(df);
+                                log.info("代服管家 订单取消成功: {}", response);
+                            });
                         }
-                    }
-//                }
-//            }
+                        break;
+                }
+                fsStoreOrderMap.setDeliveryStatus(deliveryStatus); //物流状态：0-暂无轨迹信息 1-已揽收 2-在途中,3-签收,4-问题件
+                fsStoreOrderMap.setDeliveryType(stateEx);
+                fsStoreOrderMapper.updateFsStoreOrder(fsStoreOrderMap);
+            }
         } catch (IOException e) {
             e.printStackTrace();
         }

fs-user-app/src/main/java/com/fs/app/controller/WxUserController.java

@@ -95,8 +95,13 @@ public class WxUserController extends AppBaseController{
         if (StringUtils.isBlank(param.getCode())) {
             return R.error("code不存在");
         }
-//        FsSysConfig con = configUtil.getSysConfig();
-        final WxMaService wxService = WxMaConfiguration.getMaService(param.getAppId());
+        String appId = param.getAppId();
+        if (StringUtils.isBlank(appId)){
+            FsSysConfig con = configUtil.getSysConfig();
+            appId = con.getAppid();
+        }
+
+        final WxMaService wxService = WxMaConfiguration.getMaService(appId);
         try {
             WxMaJscode2SessionResult session = wxService.getUserService().getSessionInfo(param.getCode());
             this.logger.info(session.getSessionKey());