Merge branch 'dev' of https://git.njzscloud.com/lzq/njzscloud into dev

njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/pojo/entity/MoneyChangeDetailEntity.java

@@ -109,6 +109,9 @@ public class MoneyChangeDetailEntity {
     @TableField(exist = false)
     private String nickname;
 
+    @TableField(exist = false)
+    private String sn;
+
     /**
      * 开始时间（用于时间范围查询）
      */

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/controller/OrderInfoController.java

@@ -261,6 +261,17 @@ public class OrderInfoController {
         orderInfoService.export(response, param);
     }
 
+    /**
+     * 转办
+     * @param orderId 订单Id
+     */
+    @GetMapping("/forwarded")
+    public R<?> forwarded(@RequestParam("orderId") Long orderId, @RequestParam("area") String area,
+                          @RequestParam("areaName") String areaName) {
+        orderInfoService.forwarded(orderId, area, areaName);
+        return R.success();
+    }
+
     /**
      * 改价
      */

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java

@@ -1991,4 +1991,23 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
             // 如果金额相等，则不需要处理
         }
     }
+
+    public void forwarded(Long orderId, String area, String areaName) {
+        OrderInfoEntity order = this.getById(orderId);
+        Assert.notNull(order, () -> Exceptions.clierr("订单不存在"));
+        if (null != order.getCargoPlaceId()) {
+            OrderCargoPlaceEntity cargoPlaceEntity = orderCargoPlaceService.getById(order.getCargoPlaceId());
+            if (null != cargoPlaceEntity) {
+                OrderCargoPlaceEntity placeEntity = new OrderCargoPlaceEntity();
+                placeEntity.setId(cargoPlaceEntity.getId());
+                placeEntity.setArea(area);
+                placeEntity.setAreaName(areaName);
+                orderCargoPlaceService.updateById(placeEntity);
+            } else {
+                throw Exceptions.clierr("未查询到装货地址");
+            }
+        } else {
+            throw Exceptions.clierr("装货地址不存在");
+        }
+    }
 }

njzscloud-svr/src/main/resources/mapper/money/MoneyChangeDetailMapper.xml

@@ -20,6 +20,7 @@
         mcd.create_time,
         mcd.modify_time,
         mcd.deleted,
+        oi.sn,
         CASE
         WHEN mcd.user_id IS NOT NULL THEN u.nickname
         WHEN mcd.company_id IS NOT NULL THEN bc.company_name
@@ -28,6 +29,7 @@
         FROM money_change_detail mcd
         LEFT JOIN sys_user u ON mcd.user_id = u.id
         LEFT JOIN biz_company bc ON mcd.company_id = bc.id
+        LEFT JOIN order_info oi on oi.id = mcd.order_id
         <where>
             <if test="entity.nickname != null and entity.nickname != ''">
                 AND (u.nickname LIKE CONCAT('%', #{entity.nickname}, '%') or