Merge branch 'dev' into test

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/KylinOrderRefundsVo.java

 package com.liquidnet.service.kylin.dto.vo.returns;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.kylin.dao.KylinOrderRefundsEntitiesDao;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderRefundEntitiesVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderRefundPicVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.nustaq.serialization.coders.JSONAsString;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -41,6 +44,7 @@ public class KylinOrderRefundsVo implements Serializable {
     private String refundCode;
 
     @ApiModelProperty(value = "成功退款时间")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime refundAt;
 
     @ApiModelProperty(value = "第三方退款编号")
@@ -67,6 +71,7 @@ public class KylinOrderRefundsVo implements Serializable {
     private String applicantName;
 
     @ApiModelProperty(value = "申请时间")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime applicantAt;
 
     @ApiModelProperty(value = "退款原因")
@@ -79,6 +84,7 @@ public class KylinOrderRefundsVo implements Serializable {
     private String auditorName;
 
     @ApiModelProperty(value = "审核时间")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime auditorAt;
 
     @ApiModelProperty(value = "驳回原因")
@@ -91,6 +97,7 @@ public class KylinOrderRefundsVo implements Serializable {
     private String executorName;
 
     @ApiModelProperty(value = "执行时间")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime executorAt;
 
     @ApiModelProperty(value = "回绝原因")
@@ -101,9 +108,11 @@ public class KylinOrderRefundsVo implements Serializable {
     private Integer refundCate;
 
     @ApiModelProperty(value = "添加时间")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime createdAt;
 
     @ApiModelProperty(value = "更新时间")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime updatedAt;
 
     List<KylinOrderRefundsEntitiesDao> entities;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/docu/db_liquidnet_admin_data.sql

@@ -33,6 +33,16 @@ INSERT INTO test_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, ur
 INSERT INTO test_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, perms, icon, create_by, create_time, update_by, update_time, remark) VALUES (2029, '编辑', 2027, 1, '#', 'menuItem', 'F', '0', '1', 'kylin:banners:update', '#', 'admin', '2021-06-07 20:05:58', '', null, '');
 INSERT INTO test_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, perms, icon, create_by, create_time, update_by, update_time, remark) VALUES (2031, '删除', 2027, 2, '#', 'menuItem', 'F', '0', '1', 'kylin:banners:delete', '#', 'admin', '2021-06-07 20:07:07', '', null, '');
 
+INSERT INTO test_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, perms, icon, create_by, create_time, update_by, update_time, remark) VALUES (2032, '快递管理', 2000, 4, '#', 'menuItem', 'C', '0', '1', 'kylin:performancesExpress:view', '#', 'admin', '2021-06-30 20:01:36', '', null, '');
+INSERT INTO test_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, perms, icon, create_by, create_time, update_by, update_time, remark) VALUES (2033, '演出快递列表', 2032, 0, '/kylin/performancesExpress', 'menuItem', 'C', '0', '1', 'kylin:performancesExpress:list', '#', 'admin', '2021-06-30 20:03:59', '', null, '');
+INSERT INTO test_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, perms, icon, create_by, create_time, update_by, update_time, remark) VALUES (2034, '查看演出订单', 2033, 0, '#', 'menuItem', 'F', '0', '1', 'kylin:performancesExpress:performanceOrderList', '#', 'admin', '2021-06-30 20:05:33', '', null, '');
+INSERT INTO test_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, perms, icon, create_by, create_time, update_by, update_time, remark) VALUES (2035, '下单', 2034, 1, '#', 'menuItem', 'F', '0', '1', 'kylin:performancesExpress:placeOrder', '#', 'admin', '2021-06-30 20:05:58', '', null, '');
+INSERT INTO test_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, perms, icon, create_by, create_time, update_by, update_time, remark) VALUES (2036, '取消', 2034, 2, '#', 'menuItem', 'F', '0', '1', 'kylin:performancesExpress:cancelOrder', '#', 'admin', '2021-06-30 20:07:07', '', null, '');
+INSERT INTO test_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, perms, icon, create_by, create_time, update_by, update_time, remark) VALUES (2037, '下单结果主动查询', 2034, 2, '#', 'menuItem', 'F', '0', '1', 'kylin:performancesExpress:getResult', '#', 'admin', '2021-06-30 20:07:07', '', null, '');
+INSERT INTO test_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, perms, icon, create_by, create_time, update_by, update_time, remark) VALUES (2038, '运费估算', 2034, 2, '#', 'menuItem', 'F', '0', '1', 'kylin:performancesExpress:getFreight', '#', 'admin', '2021-06-30 20:07:07', '', null, '');
+INSERT INTO test_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, perms, icon, create_by, create_time, update_by, update_time, remark) VALUES (2039, '实际运费主动查询', 2034, 2, '#', 'menuItem', 'F', '0', '1', 'kylin:performancesExpress:getListFreight', '#', 'admin', '2021-06-30 20:07:07', '', null, '');
+INSERT INTO test_ln_scene.sys_menu (menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, perms, icon, create_by, create_time, update_by, update_time, remark) VALUES (2040, '路由信息主动查询', 2034, 2, '#', 'menuItem', 'F', '0', '1', 'kylin:performancesExpress:listOrderRoute', '#', 'admin', '2021-06-30 20:07:07', '', null, '');
+
 -- sys_role_menu
 INSERT INTO test_ln_scene.sys_role_menu (role_id, menu_id) VALUES (2, 2000);
 INSERT INTO test_ln_scene.sys_role_menu (role_id, menu_id) VALUES (2, 2001);

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

@@ -108,13 +108,13 @@ public class PerformancesExpressController extends BaseController {
     }
 
     /**
-     * 订单运费估算
+     * 下单结果主动查询
      */
-    @RequiresPermissions("kylin:performancesExpress:getFreight")
-    @PostMapping("/getFreight")
+    @RequiresPermissions("kylin:performancesExpress:getResult")
+    @PostMapping("/getResult")
     @ResponseBody
-    public AjaxResult getFreight(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
-        ResponseDto res = performancesExpressServiceImpl.getFreight(performanceExpressSearchAdminParam);
+    public AjaxResult getResult(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
+        ResponseDto res = performancesExpressServiceImpl.getResult(performanceExpressSearchAdminParam);
         try {
             if (res.isSuccess()) {
                 return success();
@@ -127,13 +127,13 @@ public class PerformancesExpressController extends BaseController {
     }
 
     /**
-     * 下单结果主动查询
+     * 订单运费估算
      */
-    @RequiresPermissions("kylin:performancesExpress:getResult")
-    @PostMapping("/getResult")
+    @RequiresPermissions("kylin:performancesExpress:getFreight")
+    @PostMapping("/getFreight")
     @ResponseBody
-    public AjaxResult getResult(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
-        ResponseDto res = performancesExpressServiceImpl.getResult(performanceExpressSearchAdminParam);
+    public AjaxResult getFreight(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
+        ResponseDto res = performancesExpressServiceImpl.getFreight(performanceExpressSearchAdminParam);
         try {
             if (res.isSuccess()) {
                 return success();
@@ -146,7 +146,7 @@ public class PerformancesExpressController extends BaseController {
     }
 
     /**
-     * 运费主动查询
+     * 实际运费主动查询
      */
     @RequiresPermissions("kylin:performancesExpress:getListFreight")
     @PostMapping("/getListFreight")
@@ -165,7 +165,7 @@ public class PerformancesExpressController extends BaseController {
     }
 
     /**
-     * 路由主动查询
+     * 路由信息主动查询
      */
     @RequiresPermissions("kylin:performancesExpress:listOrderRoute")
     @PostMapping("/listOrderRoute")
@@ -183,18 +183,6 @@ public class PerformancesExpressController extends BaseController {
         }
     }
 
-    /**
-     * 订单状态推送
-     */
-
-    /**
-     * 路由推送
-     */
-
-    /**
-     * 清单运费推送
-     */
-
     /**
      * 预计派件时间
      */

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/core/config/SwaggerConfig.java

@@ -57,13 +57,13 @@ public class SwaggerConfig
         // 用ApiInfoBuilder进行定制
         return new ApiInfoBuilder()
                 // 设置标题
-                .title("标题：正在映画管理系统_接口文档")
+                .title("正在映画管理系统接口文档")
                 // 描述
-                .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
+                .description("用于管理集团旗下公司的业务信息...")
                 // 作者信息
                 .contact(new Contact(RuoYiConfig.getName(), null, null))
                 // 版本
-                .version("版本号:" + RuoYiConfig.getVersion())
+//                .version("版本号:" + RuoYiConfig.getVersion())
                 .build();
     }
 }

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

@@ -147,10 +147,10 @@
                         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> ');
-                        actions.push('<a class="btn btn-default btn-xs ' + getFreightFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定获取估算运费吗？\', table.options.getFreightUrl)"></i>运费估算</a> ');
-                        actions.push('<a class="btn btn-default btn-xs ' + getListFreightFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定获取运费信息吗？\', table.options.getListFreightUrl)"></i>主动获取运费</a> ');
-                        actions.push('<a class="btn btn-default btn-xs ' + listOrderRouteFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定获取路由信息吗？\', table.options.listOrderRouteUrl)"></i>路由主动查询</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + getResultFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定获取快递信息吗？\', table.options.getResultUrl)"></i>主动获取下单信息</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + getFreightFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定获取估算运费吗？\', table.options.getFreightUrl)"></i>运费估算</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + getListFreightFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定获取运费信息吗？\', table.options.getListFreightUrl)"></i>主动获取运费</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + listOrderRouteFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定获取路由信息吗？\', table.options.listOrderRouteUrl)"></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

@@ -140,6 +140,7 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
             hBody.put("jCity", jCity);
             hBody.put("jAddress", jAddress);
 
+            // TODO: 2021/6/30 前端选择
             hBody.put("payMethod", 0);// 运费付款方式：0-寄付月结；1-寄付现结；2-收方付；3-第三方付；
             hBody.put("expressType", expressType);// 顺丰特快
 
@@ -258,6 +259,46 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
         return ResponseDto.success();
     }
 
+    public ResponseDto getFreight(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
+        List<String> ids = performanceExpressSearchAdminParam.getIds();
+        Integer[] expressStatus = {KylinTableStatusConst.ORDER_EXPRESS_STATUS1, KylinTableStatusConst.ORDER_EXPRESS_STATUS3};
+        for (String orderTicketsId : ids) {
+            KylinOrderExpress orderExpressInfo = kylinOrderExpressMapper.selectOne(
+                    new QueryWrapper<KylinOrderExpress>().eq("order_tickets_id", orderTicketsId)
+                            .notIn("express_status", expressStatus)
+            );
+            KylinOrderTickets orderInfo = kylinOrderTicketsMapper.selectOne(
+                    new QueryWrapper<KylinOrderTickets>().eq("order_tickets_id", orderTicketsId)
+            );
+            if (null != orderExpressInfo) {
+                HashMap<String, Object> hBody = new HashMap<>();
+                hBody.put("jProvince", jProvince);
+                hBody.put("jCity", jCity);
+                hBody.put("jAddress", jAddress);
+
+                hBody.put("dProvince", orderInfo.getProvince());
+                hBody.put("dCity", orderInfo.getCity());
+                hBody.put("dAddress", orderInfo.getExpressAddress());
+                hBody.put("expressType", expressType);
+                // hBody.put("parcelWeighs", 2.00);
+                // hBody.put("volume", "10,10,20");
+
+                // 生成签名并请求
+                String result = shunfengSignUtils.generateSignatureAndRequest(hBody, "/public/order/v1/getFreight");
+                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 {
+                    // TODO: 2021/6/30 储存金额
+                    // {"result":{"deliverTime":"2021-07-01 18:00:00,2021-07-01 18:00:00","price":"23元","businessTypeDesc":"顺丰特快","businessType":"1"},"succ":"ok","msg":null}
+                }
+            }
+        }
+        return ResponseDto.success();
+    }
+
     public ResponseDto getListFreight(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
         List<String> ids = performanceExpressSearchAdminParam.getIds();
         Integer[] expressStatus = {KylinTableStatusConst.ORDER_EXPRESS_STATUS1, KylinTableStatusConst.ORDER_EXPRESS_STATUS3};
@@ -344,57 +385,4 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
         return ResponseDto.success();
     }
 
-    public ResponseDto getFreight(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
-        List<String> ids = performanceExpressSearchAdminParam.getIds();
-        Integer[] expressStatus = {KylinTableStatusConst.ORDER_EXPRESS_STATUS1, KylinTableStatusConst.ORDER_EXPRESS_STATUS3};
-        for (String orderTicketsId : ids) {
-            KylinOrderExpress orderExpressInfo = kylinOrderExpressMapper.selectOne(
-                    new QueryWrapper<KylinOrderExpress>().eq("order_tickets_id", orderTicketsId)
-                            .notIn("express_status", expressStatus)
-            );
-            KylinOrderTickets orderInfo = kylinOrderTicketsMapper.selectOne(
-                    new QueryWrapper<KylinOrderTickets>().eq("order_tickets_id", orderTicketsId)
-            );
-            if (null != orderExpressInfo) {
-                HashMap<String, Object> hBody = new HashMap<>();
-                hBody.put("jProvince", jProvince);
-                hBody.put("jCity", jCity);
-                hBody.put("jAddress", jAddress);
-
-                hBody.put("dProvince", "北京市");
-                hBody.put("dCity", "北京城区");
-                hBody.put("dAddress", orderInfo.getExpressAddress());
-                hBody.put("expressType", expressType);
-//                hBody.put("parcelWeighs", 2.00);
-//                hBody.put("volume", "10,10,20");
-
-                // 生成签名并请求
-                String result = shunfengSignUtils.generateSignatureAndRequest(hBody, "/public/order/v1/getFreight");
-                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 resultResult = (HashMap) hashMap.get("result");
-                    List<HashMap> feeList = (List) resultResult.get("feeList");
-                    if (!CollectionUtil.isEmpty(feeList)) {
-                        for (HashMap feeInfo : feeList) {
-                            KylinOrderExpressFeeInfo kylinOrderExpressFeeInfo = new KylinOrderExpressFeeInfo();
-                            String orderExpressFeeInfoId = IDGenerator.nextSnowId();
-                            kylinOrderExpressFeeInfo.setOrderExpressFeeInfoId(orderExpressFeeInfoId);
-                            kylinOrderExpressFeeInfo.setOrderExpressId(orderExpressInfo.getOrderExpressId());
-                            kylinOrderExpressFeeInfo.setType((String) feeInfo.get("type"));
-                            kylinOrderExpressFeeInfo.setName((String) feeInfo.get("name"));
-                            kylinOrderExpressFeeInfo.setValue(new BigDecimal(feeInfo.get("value").toString()));
-                            kylinOrderExpressFeeInfo.setCreatedAt(DateUtil.getNowTime());
-                            kylinOrderExpressFeeInfoMapper.insert(kylinOrderExpressFeeInfo);
-                        }
-                    }*/
-                }
-            }
-        }
-        return ResponseDto.success();
-    }
-
 }