快递

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/PerformancesExpressController.java

@@ -114,4 +114,23 @@ public class PerformancesExpressController extends BaseController {
         }
     }
 
+    /**
+     * 结果主动查询
+     */
+    @RequiresPermissions("kylin:performancesExpress:getResult")
+    @PostMapping("/getResult")
+    @ResponseBody
+    public AjaxResult getResult(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
+        ResponseDto res = performancesExpressServiceImpl.getResult(performanceExpressSearchAdminParam);
+        try {
+            if (res.isSuccess()) {
+                return success();
+            } else {
+                return error(res.getMessage());
+            }
+        } catch (Exception e) {
+            return error(e.getMessage());
+        }
+    }
+
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performancesExpress/performanceOrderList.html

@@ -70,6 +70,7 @@
 <script th:inline="javascript">
     var placeOrderFlag = [[${@permission.hasPermi('kylin:performancesExpress:placeOrder')}]];
     var cancelOrderFlag = [[${@permission.hasPermi('kylin:performancesExpress:cancelOrder')}]];
+    var getResultFlag = [[${@permission.hasPermi('kylin:performancesExpress:getResult')}]];
 
     var prefix = ctx + "kylin/performancesExpress";
 
@@ -81,6 +82,7 @@
             modalName: "演出订单",
             placeOrderUrl: prefix + "/placeOrder",
             cancelOrderUrl: prefix + "/cancelOrder",
+            getResultUrl: prefix + "/getResult",
             columns: [{
                 checkbox: true
             },
@@ -139,6 +141,7 @@
                         var actions = [];
                         actions.push('<a class="btn btn-success btn-xs ' + placeOrderFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定下单吗？\', table.options.placeOrderUrl)"></i>下单</a> ');
                         actions.push('<a class="btn btn-danger btn-xs ' + cancelOrderFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定取消快递单吗？\', table.options.cancelOrderUrl)"></i>取消</a> ');
+                        actions.push('<a class="btn btn-default btn-xs ' + getResultFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定获取快递信息吗？\', table.options.getResultUrl)"></i>主动获取下单信息</a> ');
                         return actions.join('');
                     }
                 }]

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/PerformancesExpressServiceImpl.java

@@ -122,7 +122,6 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
                     new QueryWrapper<KylinOrderExpress>()
                             .eq("order_tickets_id", orderTicketsId)
             );
-
             String codeNum = StringUtils.leftPad(String.valueOf(placeCount), 3, "0");
             String OrderExpressCode = "NEW"+orderInfo.getOrderCode().concat(codeNum);
             hBody.put("orderId", OrderExpressCode);
@@ -175,27 +174,86 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
                     new QueryWrapper<KylinOrderExpress>().eq("order_tickets_id", orderTicketsId)
                             .ne("express_status", KylinTableStatusConst.ORDER_EXPRESS_STATUS2)
             );
-            HashMap<String, Object> hBody = new HashMap<>();
-            hBody.put("orderId", orderExpressInfo.getOrderExpressCode());
+            if (null != orderExpressInfo) {
+                HashMap<String, Object> hBody = new HashMap<>();
+                hBody.put("orderId", orderExpressInfo.getOrderExpressCode());
 
-            // 时间戳
-            long currentTimeMillis = System.currentTimeMillis();
+                // 时间戳
+                long currentTimeMillis = System.currentTimeMillis();
 
-            // 生成签名并请求
-            String result = shunfengSignUtils.generateSignatureAndRequest(currentTimeMillis + "", hBody, "/public/order/v1/cancelOrder");
-            HashMap hashMap = JsonUtils.fromJson(result, HashMap.class);
-            System.out.println(result);
-            if (hashMap.get("succ").equals("fail")) {
-                String msg = (String) hashMap.get("msg");
-                return ResponseDto.failure(msg);
-            } else {
-                KylinOrderExpress kylinOrderExpress = new KylinOrderExpress();
-                kylinOrderExpress.setExpressStatus(KylinTableStatusConst.ORDER_EXPRESS_STATUS2);
-                kylinOrderExpress.setUpdatedAt(DateUtil.getNowTime());
-                kylinOrderExpressMapper.update(
-                        kylinOrderExpress
-                        , new UpdateWrapper<KylinOrderExpress>().in("order_express_id", orderExpressInfo.getOrderExpressId())
+                // 生成签名并请求
+                String result = shunfengSignUtils.generateSignatureAndRequest(currentTimeMillis + "", hBody, "/public/order/v1/cancelOrder");
+                HashMap hashMap = JsonUtils.fromJson(result, HashMap.class);
+                System.out.println(result);
+                if (hashMap.get("succ").equals("fail")) {
+                    String msg = (String) hashMap.get("msg");
+                    return ResponseDto.failure(msg);
+                } else {
+                    KylinOrderExpress kylinOrderExpress = new KylinOrderExpress();
+                    kylinOrderExpress.setExpressStatus(KylinTableStatusConst.ORDER_EXPRESS_STATUS2);
+                    kylinOrderExpress.setUpdatedAt(DateUtil.getNowTime());
+                    kylinOrderExpressMapper.update(
+                            kylinOrderExpress
+                            , new UpdateWrapper<KylinOrderExpress>().in("order_express_id", orderExpressInfo.getOrderExpressId())
+                    );
+                }
+            }
+        }
+        return ResponseDto.success();
+    }
+
+    public ResponseDto getResult(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
+        List<String> ids = performanceExpressSearchAdminParam.getIds();
+        for (String orderTicketsId : ids) {
+            KylinOrderExpress orderExpressInfo = kylinOrderExpressMapper.selectOne(
+                    new QueryWrapper<KylinOrderExpress>().eq("order_tickets_id", orderTicketsId)
+                            .ne("express_status", KylinTableStatusConst.ORDER_EXPRESS_STATUS2)
+            );
+            if (null != orderExpressInfo) {
+                KylinOrderTickets orderInfo = kylinOrderTicketsMapper.selectOne(
+                        new QueryWrapper<KylinOrderTickets>().eq("order_tickets_id", orderTicketsId)
+                );
+                Integer placeCount = kylinOrderExpressMapper.selectCount(
+                        new QueryWrapper<KylinOrderExpress>()
+                                .eq("order_tickets_id", orderTicketsId)
                 );
+                String codeNum = StringUtils.leftPad(String.valueOf(placeCount), 3, "0");
+                String OrderExpressCode = "NEW"+orderInfo.getOrderCode().concat(codeNum);
+
+                HashMap<String, Object> hBody = new HashMap<>();
+                hBody.put("orderId", OrderExpressCode);
+                hBody.put("searchType", 1); //查询类型：1,正向单查询，传入的orderid为正向定单号，2，退货单查询，传入的orderid为退货原始订单号
+
+                // 时间戳
+                long currentTimeMillis = System.currentTimeMillis();
+
+                // 生成签名并请求
+                String result = shunfengSignUtils.generateSignatureAndRequest(currentTimeMillis + "", hBody, "/public/order/v1/getResult");
+                HashMap hashMap = JsonUtils.fromJson(result, HashMap.class);
+                System.out.println(result);
+                if (hashMap.get("succ").equals("fail")) {
+                    String msg = (String) hashMap.get("msg");
+                    return ResponseDto.failure(msg);
+                } else {
+                    HashMap hashMapResult = (HashMap) hashMap.get("result");
+                    KylinOrderExpress kylinOrderExpress = new KylinOrderExpress();
+                    String orderExpressId = IDGenerator.nextSnowId();
+                    kylinOrderExpress.setExpressStatus(KylinTableStatusConst.ORDER_EXPRESS_STATUS1);
+                    kylinOrderExpress.setOrderExpressId(orderExpressId);
+                    kylinOrderExpress.setOrderTicketsId(orderTicketsId);
+                    kylinOrderExpress.setOrderExpressCode(OrderExpressCode);
+                    kylinOrderExpress.setMailno((String) hashMapResult.get("mailno"));
+                    kylinOrderExpress.setExpressType(expressType);
+                    kylinOrderExpress.setFilterResult(hashMapResult.get("filter_result").toString());
+                    kylinOrderExpress.setRemark((String) hashMapResult.get("remark"));
+                    kylinOrderExpress.setOrigincode((String) hashMapResult.get("origincode"));
+                    kylinOrderExpress.setDestcode((String) hashMapResult.get("destcode"));
+                    kylinOrderExpress.setPrintIcon((String) hashMapResult.get("printIcon"));
+                    kylinOrderExpress.setPrintFlag((String) hashMapResult.get("printFlag"));
+                    kylinOrderExpress.setTwoDimensionCode((String) hashMapResult.get("twoDimensionCode"));
+                    kylinOrderExpress.setCreatedAt(DateUtil.getNowTime());
+                    kylinOrderExpressMapper.insert(kylinOrderExpress);
+                }
             }
         }
         return ResponseDto.success();