企业配置付款通道

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/saasmanager/entity/HwPlatformCompany.java

@@ -78,6 +78,12 @@ public class HwPlatformCompany implements Serializable {
      */
     @Excel(name = "联系电话", width = 15)
     private java.lang.String contactPhone;
+
+    /**
+     * 付款通道（0：外部通道 1：内部通道）
+     */
+    private Integer paymentLane;
+
     /**
      * 税号
      */

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/saasmanager/service/impl/HwPlatformCompanyServiceImpl.java

@@ -74,13 +74,14 @@ public class HwPlatformCompanyServiceImpl extends ServiceImpl<HwPlatformCompanyM
 
     /**
      * 企业服务商上传合同
+     *
      * @param hwCompanyUploadContract
      * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String companyUploadContract(HwCompanyUploadContract hwCompanyUploadContract) {
-        HwPlatformCompany hwPlatformCompany=getById(hwCompanyUploadContract.getCompanyId());
+        HwPlatformCompany hwPlatformCompany = getById(hwCompanyUploadContract.getCompanyId());
         String accessToken = OauthTokenUtils.getDayAccessToken();
         String requestUrl = OauthApi.COMPANY_SUBCONTRACTOR_UPLOAD_CONTRACT;
         Map<String, Object> parameters = new HashMap<>();
@@ -103,10 +104,10 @@ public class HwPlatformCompanyServiceImpl extends ServiceImpl<HwPlatformCompanyM
         if (jsonObject != null) {
             if (jsonObject.getBoolean("success")) {
                 log.info("企业-服务商合同上传===={}", jsonObject);
-                String msg=jsonObject.getString("message");
+                String msg = jsonObject.getString("message");
                 return msg;
             } else {
-                String msg=jsonObject.getString("message");
+                String msg = jsonObject.getString("message");
                 //抛出异常
                 throw new JeecgBootException(msg);
             }
@@ -123,7 +124,7 @@ public class HwPlatformCompanyServiceImpl extends ServiceImpl<HwPlatformCompanyM
         //获取当前登录用户
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         List<String> companyCodeList = RoleDataUtils.findCompanyCodeList(sysUser.getUsername(), routeUrl, sysUser.getOrgCode());
-        if(companyCodeList.size()==0){
+        if (companyCodeList.size() == 0) {
             page.setRecords(Collections.emptyList());
             return page;
         }
@@ -150,11 +151,11 @@ public class HwPlatformCompanyServiceImpl extends ServiceImpl<HwPlatformCompanyM
             if (jsonObject.getBoolean(HttpsContants.SUCCESS_FLAG)) {
                 log.info("企业列表===={}", jsonObject);
                 JSONObject jsonObject1 = jsonObject.getJSONObject("result");
-                List<Map<String, Object>> list = ( List<Map<String, Object>>) jsonObject1.get("records");
+                List<Map<String, Object>> list = (List<Map<String, Object>>) jsonObject1.get("records");
                 log.info("企业列表==={}", list);
-                List<HwPlatformCompany> list1=new ArrayList();
-                for (int i = 0; i <list.size() ; i++) {
-                    HwPlatformCompany hlgCompany1=baseMapper.getByCompanyCode((String)list.get(i).get("companyCode"));
+                List<HwPlatformCompany> list1 = new ArrayList();
+                for (int i = 0; i < list.size(); i++) {
+                    HwPlatformCompany hlgCompany1 = baseMapper.getByCompanyCode((String) list.get(i).get("companyCode"));
                     hlgCompany1.setCompanySubcontractorStatus((Integer) list.get(i).get("companySubcontractorStatus"));
                     list1.add(hlgCompany1);
                 }
@@ -311,7 +312,7 @@ public class HwPlatformCompanyServiceImpl extends ServiceImpl<HwPlatformCompanyM
      * @param hwPlatformCompany
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void saveCompany(HwPlatformCompany hwPlatformCompany) {
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         //自动生成一个二级机构
@@ -341,6 +342,8 @@ public class HwPlatformCompanyServiceImpl extends ServiceImpl<HwPlatformCompanyM
         hwPlatformCompany.setUpdateTime(new Date());
         hwPlatformCompany.setSysOrgCode(sysDepart.getOrgCode());
         hwPlatformCompany.setBusinessBelongId(hwPlatform.getBusinessBelongId());
+        //默认支付通道
+        hwPlatformCompany.setPaymentLane(1);
         this.save(hwPlatformCompany);
         //同步慧盈
         String accessToken = OauthTokenUtils.getDayAccessToken();
@@ -361,6 +364,7 @@ public class HwPlatformCompanyServiceImpl extends ServiceImpl<HwPlatformCompanyM
         parameters.put("updateBy", sysUser.getUsername());
         parameters.put("paymentType", 1);
         parameters.put("businessBelongId", hwPlatform.getBusinessBelongId());
+        parameters.put("paymentLane", hwPlatformCompany.getPaymentLane());
         log.info("param============{}", JSONObject.toJSONString(parameters));
         //数据加密
         String biz_content = CryptTool.encode(JSONObject.toJSONString(parameters));
@@ -527,11 +531,11 @@ public class HwPlatformCompanyServiceImpl extends ServiceImpl<HwPlatformCompanyM
         String accessToken = OauthTokenUtils.getDayAccessToken();
         String requestUrl = OauthApi.COMPANY_SUBCONTRACTOR_ADD;
         Map<String, Object> parameters = new HashMap<>();
-        if(hwCompanySubcontractor.getIsThroughPlatform()==1){
+        if (hwCompanySubcontractor.getIsThroughPlatform() == 1) {
             hwCompanySubcontractor.setCpType(2);
             //cpType=1时subcontractorId为服务商subcontractorId，cpType=2时subcontractorId为开心平台cpid
             parameters.put("subcontractorId", hwCompanySubcontractor.getCpId());
-        }else if(hwCompanySubcontractor.getIsThroughPlatform()==0){
+        } else if (hwCompanySubcontractor.getIsThroughPlatform() == 0) {
             hwCompanySubcontractor.setCpType(1);
             //cpType=1时subcontractorId为服务商subcontractorId，cpType=2时subcontractorId为开心平台cpid
             parameters.put("subcontractorId", hwCompanySubcontractor.getSubcontractorId());
@@ -540,7 +544,7 @@ public class HwPlatformCompanyServiceImpl extends ServiceImpl<HwPlatformCompanyM
         parameters.put("serviceRate", hwCompanySubcontractor.getServiceRate());
         //1:服务商 2：开心
         parameters.put("cpType", hwCompanySubcontractor.getCpType());
-        if(hwCompanySubcontractor.getCpType()==2){
+        if (hwCompanySubcontractor.getCpType() == 2) {
             parameters.put("cpSubcontractorId", hwCompanySubcontractor.getCpSubcontractorId());
         }
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -663,7 +667,7 @@ public class HwPlatformCompanyServiceImpl extends ServiceImpl<HwPlatformCompanyM
         parameters.put("subcontractorId", hwCompanySubcontractor.getSubcontractorId());
         //1:服务商 2：开心
         parameters.put("cpType", hwCompanySubcontractor.getCpType());
-        if(hwCompanySubcontractor.getCpType()==2){
+        if (hwCompanySubcontractor.getCpType() == 2) {
             parameters.put("cpSubcontractorId", hwCompanySubcontractor.getCpSubcontractorId());
         }
         log.info("param============{}", JSONObject.toJSONString(parameters));