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

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

@@ -25,9 +25,9 @@ public interface IBocomVipAccountBasicInfoService extends IService<BocomVipAccou
 
     /**
      * 新增会员登记簿
-     * @param basicInfo
+     * @param bocomBasicInfoId
      */
-    BocomVipAccountBasicInfo doAddOrUpdate(BocomVipAccountBasicInfo basicInfo);
+    BocomVipAccountBasicInfo doAddOrUpdate(Long bocomBasicInfoId);
 
     /**
      * 详情

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

@@ -168,9 +168,21 @@ public class BocomVipAccountBasicInfoServiceImpl extends ServiceImpl<BocomVipAcc
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public BocomVipAccountBasicInfo doAddOrUpdate(BocomVipAccountBasicInfo basicInfo) {
+    public BocomVipAccountBasicInfo doAddOrUpdate(Long bocomBasicInfoId) {
 
-        basicInfo.setAccountAlias(basicInfo.getAccountName());
+        if (bocomBasicInfoId == null) {
+            throw new BusinessException(CodeUtil.FAIL, "开户id不能为空！");
+        }
+        BocomBasicInfo basicInfo = bocomBasicInfoService.getById(bocomBasicInfoId);
+        if (basicInfo == null){
+            throw new BusinessException(CodeUtil.FAIL, "未查询到客户信息！");
+        }
+        BocomVipAccountBasicInfo vipAccountBasicInfo = new BocomVipAccountBasicInfo();
+        vipAccountBasicInfo.setBocomBasicInfoId(basicInfo.getId());
+        vipAccountBasicInfo.setAccountName(basicInfo.getCustomerName());
+        vipAccountBasicInfo.setAccountAlias(basicInfo.getCustomerName());
+        vipAccountBasicInfo.setSource("贸理通");
+        vipAccountBasicInfo.setCurrency("CNY");
         ResponseJson responseJson;
         try {
             responseJson = restTemplate.postForObject(bocomVipUpdateUrl, basicInfo, ResponseJson.class);
@@ -182,7 +194,6 @@ public class BocomVipAccountBasicInfoServiceImpl extends ServiceImpl<BocomVipAcc
             throw new BusinessException(CodeUtil.FAIL, e.getMessage());
         }
         BocomVipAccountBasicInfo newBasicInfo = JSONObject.parseObject(JSONObject.toJSONString(responseJson.getData()), BocomVipAccountBasicInfo.class);
-//        BocomVipAccountBasicInfo newBasicInfo = JSONUtil.toBean(responseJson.getData()., BocomVipAccountBasicInfo.class)
         if (newBasicInfo.getId() == null) {
             if (newBasicInfo.getAccountStatus() != null && newBasicInfo.getAccountStatus() == 1) {
                 newBasicInfo.setOpenTime(new Date());

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

@@ -25,12 +25,12 @@ public class BocomVipAccountController {
     /**
      * 新增/修改会员登记簿
      *
-     * @param basicInfo
+     * @param bocomBasicInfoId
      * @return
      */
-    @PostMapping("bocomVipAccount/doAddOrUpdate")
-    public ResponseJson doAdd(@RequestBody BocomVipAccountBasicInfo basicInfo) {
-        return new ResponseJson(bocomVipAccountBasicInfoService.doAddOrUpdate(basicInfo));
+    @GetMapping("bocomVipAccount/doAddOrUpdate")
+    public ResponseJson doAdd(@RequestParam Long bocomBasicInfoId) {
+        return new ResponseJson(bocomVipAccountBasicInfoService.doAddOrUpdate(bocomBasicInfoId));
     }