Merge remote-tracking branch 'origin/bocom' into bocom

src/main/java/com/inkasso/factoring/bocom/vipaccount/service/IBocomVipAccountBasicInfoService.java

@@ -27,7 +27,7 @@ public interface IBocomVipAccountBasicInfoService extends IService<BocomVipAccou
      * 新增会员登记簿
      * @param bocomBasicInfoId
      */
-    BocomVipAccountBasicInfo doAddOrUpdate(Long bocomBasicInfoId);
+    BocomVipAccountBasicInfo doAdd(Long bocomBasicInfoId);
 
     /**
      * 详情
@@ -36,6 +36,12 @@ public interface IBocomVipAccountBasicInfoService extends IService<BocomVipAccou
      */
     BocomVipAccountBasicInfo getDetail(Long id);
 
+    /**
+     * 修改会员登记簿
+     * @param basicInfo
+     */
+    void doUpdate(BocomVipAccountBasicInfo basicInfo);
+
     /**
      * 更新会员登记簿信息
      * @param id

src/main/java/com/inkasso/factoring/bocom/vipaccount/service/impl/BocomVipAccountBasicInfoServiceImpl.java

@@ -168,13 +168,13 @@ public class BocomVipAccountBasicInfoServiceImpl extends ServiceImpl<BocomVipAcc
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public BocomVipAccountBasicInfo doAddOrUpdate(Long bocomBasicInfoId) {
+    public BocomVipAccountBasicInfo doAdd(Long bocomBasicInfoId) {
 
         if (bocomBasicInfoId == null) {
             throw new BusinessException(CodeUtil.FAIL, "开户id不能为空！");
         }
         BocomBasicInfo basicInfo = bocomBasicInfoService.getById(bocomBasicInfoId);
-        if (basicInfo == null){
+        if (basicInfo == null) {
             throw new BusinessException(CodeUtil.FAIL, "未查询到客户信息！");
         }
         BocomVipAccountBasicInfo vipAccountBasicInfo = new BocomVipAccountBasicInfo();
@@ -185,7 +185,7 @@ public class BocomVipAccountBasicInfoServiceImpl extends ServiceImpl<BocomVipAcc
         vipAccountBasicInfo.setCurrency("CNY");
         ResponseJson responseJson;
         try {
-            responseJson = restTemplate.postForObject(bocomVipUpdateUrl, basicInfo, ResponseJson.class);
+            responseJson = restTemplate.postForObject(bocomVipUpdateUrl, vipAccountBasicInfo, ResponseJson.class);
             if (!responseJson.getCode().equals(200)) {
                 throw new BusinessException(CodeUtil.FAIL, responseJson.getMsg().toString());
             }
@@ -204,31 +204,6 @@ public class BocomVipAccountBasicInfoServiceImpl extends ServiceImpl<BocomVipAcc
                 bocomVipLimitInfo.setBocomVipAccountBasicInfoId(newBasicInfo.getId());
                 bocomVipLimitInfoService.save(bocomVipLimitInfo);
             }
-        } else {
-            updateById(newBasicInfo);
-            if (newBasicInfo.getBocomVipLimitInfo() != null) {
-                BocomVipLimitInfo bocomVipLimitInfo = newBasicInfo.getBocomVipLimitInfo();
-                BocomVipLimitInfo oldLimitInfo = bocomVipLimitInfoService.lambdaQuery()
-                        .eq(BocomVipLimitInfo::getBocomVipAccountBasicInfoId, newBasicInfo.getId())
-                        .one();
-                bocomVipLimitInfo.setBocomVipAccountBasicInfoId(newBasicInfo.getId());
-                bocomVipLimitInfo.setId(oldLimitInfo.getId());
-                bocomVipLimitInfoService.updateById(bocomVipLimitInfo);
-            }
-        }
-
-        if (CollectionUtils.isNotEmpty(newBasicInfo.getSilentAccountInfoList())) {
-            newBasicInfo.getSilentAccountInfoList().forEach(bocomVipSilentAccountInfo -> {
-                bocomVipSilentAccountInfo.setBocomVipAccountBasicInfoId(newBasicInfo.getId());
-                bocomVipSilentAccoutInfoService.save(bocomVipSilentAccountInfo);
-            });
-        }
-
-        if (CollectionUtils.isNotEmpty(newBasicInfo.getDeleteSilentIds())) {
-            newBasicInfo.getDeleteSilentIds().forEach(silentId -> {
-                bocomVipSilentAccoutInfoService.removeById(silentId);
-            });
-
         }
         return newBasicInfo;
     }
@@ -266,6 +241,52 @@ public class BocomVipAccountBasicInfoServiceImpl extends ServiceImpl<BocomVipAcc
         return basicInfo;
     }
 
+    @Override
+    public void doUpdate(BocomVipAccountBasicInfo basicInfo) {
+        if (basicInfo.getId() == null) {
+            throw new BusinessException(CodeUtil.FAIL, "会员登记簿id不能为空！");
+        }
+        BocomVipAccountBasicInfo oldBasicInfo = getById(basicInfo.getId());
+        basicInfo.setAccountNumber(oldBasicInfo.getAccountNumber());
+        basicInfo.setBocomBasicInfoId(oldBasicInfo.getBocomBasicInfoId());
+        ResponseJson responseJson;
+        try {
+            responseJson = restTemplate.postForObject(bocomVipUpdateUrl, basicInfo, ResponseJson.class);
+            if (!responseJson.getCode().equals(200)) {
+                throw new BusinessException(CodeUtil.FAIL, responseJson.getMsg().toString());
+            }
+
+        } catch (Exception e) {
+            throw new BusinessException(CodeUtil.FAIL, e.getMessage());
+        }
+        BocomVipAccountBasicInfo newBasicInfo = JSONObject.parseObject(JSONObject.toJSONString(responseJson.getData()), BocomVipAccountBasicInfo.class);
+
+        updateById(newBasicInfo);
+        if (newBasicInfo.getBocomVipLimitInfo() != null) {
+            BocomVipLimitInfo bocomVipLimitInfo = newBasicInfo.getBocomVipLimitInfo();
+            BocomVipLimitInfo oldLimitInfo = bocomVipLimitInfoService.lambdaQuery()
+                    .eq(BocomVipLimitInfo::getBocomVipAccountBasicInfoId, newBasicInfo.getId())
+                    .one();
+            bocomVipLimitInfo.setBocomVipAccountBasicInfoId(newBasicInfo.getId());
+            bocomVipLimitInfo.setId(oldLimitInfo.getId());
+            bocomVipLimitInfoService.updateById(bocomVipLimitInfo);
+
+            if (CollectionUtils.isNotEmpty(newBasicInfo.getSilentAccountInfoList())) {
+                newBasicInfo.getSilentAccountInfoList().forEach(bocomVipSilentAccountInfo -> {
+                    bocomVipSilentAccountInfo.setBocomVipAccountBasicInfoId(newBasicInfo.getId());
+                    bocomVipSilentAccoutInfoService.save(bocomVipSilentAccountInfo);
+                });
+            }
+
+            if (CollectionUtils.isNotEmpty(newBasicInfo.getDeleteSilentIds())) {
+                newBasicInfo.getDeleteSilentIds().forEach(silentId -> {
+                    bocomVipSilentAccoutInfoService.removeById(silentId);
+                });
+
+            }
+        }
+    }
+
     @Override
     public void refreshBocomVipBasic(Long id) {
 

src/main/java/com/inkasso/factoring/bocom/vipaccount/web/BocomVipAccountController.java

@@ -23,14 +23,14 @@ public class BocomVipAccountController {
 
 
     /**
-     * 新增/修改会员登记簿
+     * 新增会员登记簿
      *
      * @param bocomBasicInfoId
      * @return
      */
-    @GetMapping("bocomVipAccount/doAddOrUpdate")
+    @GetMapping("bocomVipAccount/doAdd")
     public ResponseJson doAdd(@RequestParam Long bocomBasicInfoId) {
-        return new ResponseJson(bocomVipAccountBasicInfoService.doAddOrUpdate(bocomBasicInfoId));
+        return new ResponseJson(bocomVipAccountBasicInfoService.doAdd(bocomBasicInfoId));
     }
 
 
@@ -44,6 +44,18 @@ public class BocomVipAccountController {
         return new ResponseJson(bocomVipAccountBasicInfoService.findList());
     }
 
+    /**
+     * 修改会员登记簿（新增/删除静默户）
+     *
+     * @param basicInfo
+     * @return
+     */
+    @PostMapping("bocomVipAccount/doUpdate")
+    public ResponseJson doUpdate(@RequestBody BocomVipAccountBasicInfo basicInfo) {
+        bocomVipAccountBasicInfoService.doUpdate(basicInfo);
+        return new ResponseJson("操作成功！");
+    }
+
     /**
      * 获取详情
      *