fix

zhongzheng-admin/src/main/java/com/zhongzheng/controller/order/OrderController.java

@@ -5,6 +5,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 import cn.hutool.core.lang.Validator;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.zhongzheng.common.core.domain.model.LoginUser;
@@ -20,6 +21,10 @@ import com.zhongzheng.modules.order.service.IOrderService;
 import com.zhongzheng.modules.order.vo.OrderGoodsVo;
 import com.zhongzheng.modules.order.vo.OrderListVo;
 import com.zhongzheng.modules.order.vo.OrderVo;
+import com.zhongzheng.modules.system.bo.SysTenantEditBo;
+import com.zhongzheng.modules.system.domain.SysTenant;
+import com.zhongzheng.modules.system.service.ISysTenantService;
+import com.zhongzheng.modules.system.vo.SysTenantHandleAccountVo;
 import com.zhongzheng.modules.user.domain.UserSubscribe;
 import com.zhongzheng.modules.user.service.IUserSubscribeService;
 import lombok.RequiredArgsConstructor;
@@ -61,6 +66,8 @@ public class OrderController extends BaseController {
 
     private final TokenService tokenService;
 
+    private final ISysTenantService iSysTenantService;
+
     /**
      * 查询订单列表
      */
@@ -199,5 +206,27 @@ public class OrderController extends BaseController {
         return AjaxResult.success(iOrderService.questionGoodsOpenImport(importBoList,loginUser.getUser().getUserId(),SecurityUtils.getUsername()));
     }
 
+    @ApiOperation("获取经办订单收款信息")
+    @PreAuthorize("@ss.hasPermi('system:order:query')")
+    @GetMapping("/handleBank")
+    public AjaxResult<SysTenantHandleAccountVo> getHandleBank() {
+        String tenantId = ServletUtils.getRequest().getHeader("TenantId");
+        SysTenant tenant = iSysTenantService.getById(tenantId);
+        String information = tenant.getHandleBank();
+        SysTenantHandleAccountVo accountVo = JSONObject.parseObject(information, SysTenantHandleAccountVo.class);
+        return AjaxResult.success(accountVo);
+    }
+
+    @ApiOperation("修改经办订单收款信息")
+    @PreAuthorize("@ss.hasPermi('system:order:query')")
+    @GetMapping("/edit/handleBank")
+    public AjaxResult<Void> editHandleBank(SysTenantHandleAccountVo bo) {
+        String json = JSONObject.toJSONString(bo);
+        String tenantId = ServletUtils.getRequest().getHeader("TenantId");
+        SysTenantEditBo editBo = new SysTenantEditBo();
+        editBo.setTenantId(Long.parseLong(tenantId));
+        editBo.setHandleBank(json);
+        return toAjax(iSysTenantService.updateByEditBo(editBo)?1:0);
+    }
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderHandleServiceImpl.java

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.order.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
@@ -18,6 +19,9 @@ import com.zhongzheng.modules.order.service.IOrderPayService;
 import com.zhongzheng.modules.order.service.IOrderService;
 import com.zhongzheng.modules.order.vo.OrderHandleGoodsVo;
 import com.zhongzheng.modules.order.vo.OrderHandleVo;
+import com.zhongzheng.modules.system.domain.SysTenant;
+import com.zhongzheng.modules.system.service.ISysTenantService;
+import com.zhongzheng.modules.system.vo.SysTenantHandleAccountVo;
 import com.zhongzheng.modules.user.bo.SubjectStudyRecordQueryBo;
 import com.zhongzheng.modules.user.service.IUserService;
 import com.zhongzheng.modules.user.service.IUserStudyRecordService;
@@ -61,6 +65,9 @@ public class OrderHandleServiceImpl extends ServiceImpl<OrderHandleMapper, Order
     @Autowired
     private IUserStudyRecordService iUserStudyRecordService;
 
+    @Autowired
+    private ISysTenantService sysTenantService;
+
     @Override
     public OrderHandleVo queryById(Long id){
         OrderHandle db = this.baseMapper.selectById(id);
@@ -153,6 +160,16 @@ public class OrderHandleServiceImpl extends ServiceImpl<OrderHandleMapper, Order
         if(Validator.isEmpty(add.getInputFrom())){
             add.setInputFrom(1);
         }
+        String tenantId = ServletUtils.getRequest().getHeader("TenantId");
+        SysTenant tenant = sysTenantService.getById(tenantId);
+        //账号信息
+        String information = tenant.getHandleBank();
+        SysTenantHandleAccountVo accountVo = JSONObject.parseObject(information, SysTenantHandleAccountVo.class);
+        if(Validator.isNotEmpty(accountVo)){
+            add.setRecCompanyAccount(accountVo.getRecCompanyAccount());
+            add.setRecCompanyBank(accountVo.getRecCompanyBank());
+            add.setRecCompanyName(accountVo.getRecCompanyName());
+        }
         if(this.save(add)){
             return add.getHandleOrderSn();
         }

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/bo/SysTenantEditBo.java

@@ -113,4 +113,5 @@ public class SysTenantEditBo {
     @ApiModelProperty("后台域名")
     private String hostAdmin;
 
+    private String handleBank;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/domain/SysTenant.java

@@ -115,5 +115,6 @@ private static final long serialVersionUID=1L;
     private Integer examRoom;
     /** 新考学时推送标识：1推送旧系统 0正常 */
     private Integer periodSign;
-
+    /** 经办订单对公收款账户 */
+    private String handleBank;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/vo/SysTenantHandleAccountVo.java

@@ -0,0 +1,26 @@
+package com.zhongzheng.modules.system.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 系统商户视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2021-08-03
+ */
+@Data
+@ApiModel("系统商户视图对象")
+public class SysTenantHandleAccountVo {
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("收款公司名称")
+	private String recCompanyName;
+	@ApiModelProperty("收款公司开户银行")
+	private String recCompanyBank;
+	@ApiModelProperty("收款公司账号")
+	private String recCompanyAccount;
+
+}