Merge branch 'dev' of code.sz-chaohui.cn:miaoweiw/warehouse into dev

src/main/java/com/boco/nbd/wios/export/Contants.java

@@ -63,9 +63,9 @@ public class Contants {
 
 
     public static final String export_warrantyOrder_field = "no,orderId,userName,userPhone,wallboxNo,startTimeStr,endTimeStr";
     public static final String export_warrantyOrder_field = "no,orderId,userName,userPhone,wallboxNo,startTimeStr,endTimeStr";
 
 
-    public static final String export_wareHouse_title = "序号,仓库名称,仓库等级,所属区域,仓库归属,所属服务商,启用状态,描述";
+    public static final String export_wareHouse_title = "序号,仓库名称,仓库等级,仓库区域,仓库归属,收件人,联系电话,仓库地址,启用状态,备注";
 
 
-    public static final String export_wareHouse_field = "no,name,warehouseLevenName,areaName,warehouseAttributionName,serviceProviderName,isEnabledName,msg";
+    public static final String export_wareHouse_field = "no,name,warehouseLevenName,areaName,warehouseAttributionName,receivePeople,receivePhone,receiveAddress,isEnabledName,msg";
 
 
     public static final String export_single_title = "调拨单号,创建时间,创建人,说明,调拨类型,调入仓库,调出仓库";
     public static final String export_single_title = "调拨单号,创建时间,创建人,说明,调拨类型,调入仓库,调出仓库";
 
 

src/main/java/com/boco/nbd/wios/manage/controller/WallboxApplyController.java

@@ -269,6 +269,7 @@ public class WallboxApplyController {
      * 修改墙盒申请
      * 修改墙盒申请
      */
      */
     @PutMapping
     @PutMapping
+    @ApiOperation(value = "修改")
     public BaseResponse<Object> edit(@RequestBody WallboxApply tWallboxApply) {
     public BaseResponse<Object> edit(@RequestBody WallboxApply tWallboxApply) {
         return new BaseResponse<>(wallboxApplyService.updateWallboxApply(tWallboxApply));
         return new BaseResponse<>(wallboxApplyService.updateWallboxApply(tWallboxApply));
     }
     }

src/main/java/com/boco/nbd/wios/manage/service/impl/WallboxApplyService.java

@@ -149,11 +149,11 @@ public class WallboxApplyService {
      */
      */
 
 
     public int updateWallboxApply(WallboxApply wallboxApply) {
     public int updateWallboxApply(WallboxApply wallboxApply) {
-        WallboxApply record = wallboxApplyMapper.selectWallboxApplyByOrderId(wallboxApply.getOutOrderId());
+        validateApplyExists(wallboxApply.getOrderId());
+        WallboxApply record = wallboxApplyMapper.selectWallboxApplyByOrderId(wallboxApply.getOrderId());
         if (!CHECK_STATUS_REJECT.equals(record.getCheckStatus())) {
         if (!CHECK_STATUS_REJECT.equals(record.getCheckStatus())) {
             throw new ServiceException("非驳回状态订单无法修改信息！");
             throw new ServiceException("非驳回状态订单无法修改信息！");
         }
         }
-        validateApplyExists(wallboxApply.getOrderId());
         wallboxApply.setModifyTime(new Date());
         wallboxApply.setModifyTime(new Date());
         wallboxApply.setCheckStatus(1L);
         wallboxApply.setCheckStatus(1L);
         return wallboxApplyMapper.updateWallboxApply(wallboxApply);
         return wallboxApplyMapper.updateWallboxApply(wallboxApply);

src/main/resources/mybatis/mapper/def/common/WallboxApplyMapper.xml

@@ -194,6 +194,7 @@
                t_wallbox_apply.created_time,
                t_wallbox_apply.created_time,
                t_wallbox_apply.modify_account,
                t_wallbox_apply.modify_account,
                t_wallbox_apply.modify_time,
                t_wallbox_apply.modify_time,
+               wb_account.name                 as checkName,
                t_order.user_name,
                t_order.user_name,
                t_order.user_phone,
                t_order.user_phone,
                t_order.wallbox_model,
                t_order.wallbox_model,
@@ -206,10 +207,11 @@
                t_order.address,
                t_order.address,
                t_order.out_order_id,
                t_order.out_order_id,
                t_order.install_finish_time,
                t_order.install_finish_time,
-               t_order.shipno as tracking_number
+               t_order.shipno                  as tracking_number
 
 
         FROM t_order
         FROM t_order
                  LEFT JOIN t_wallbox_apply ON t_wallbox_apply.order_id = t_order.id
                  LEFT JOIN t_wallbox_apply ON t_wallbox_apply.order_id = t_order.id
+                 left join wb_account on t_wallbox_apply.check_account = wb_account.id
         where t_wallbox_apply.order_id = #{orderId}
         where t_wallbox_apply.order_id = #{orderId}
     </select>
     </select>