修改审核bug

src/main/java/com/pangding/web/company/dao/CompanyRechargeDao.java

+package com.pangding.web.company.dao;
+
+import com.yanzuoguang.dao.BaseDao;
+
+public interface CompanyRechargeDao extends BaseDao {
+}

src/main/java/com/pangding/web/company/dao/impl/CompanyRechargeDaoImpl.java

+package com.pangding.web.company.dao.impl;
+
+import com.pangding.web.company.dao.CompanyRechargeDao;
+import com.pangding.web.vo2.user.company.pd.CompanyRechargeVo;
+import com.yanzuoguang.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Component;
+
+@Component
+public class CompanyRechargeDaoImpl extends BaseDaoImpl implements CompanyRechargeDao {
+
+    @Override
+    protected void init() {
+        register(CompanyRechargeVo.class);
+    }
+
+}

src/main/java/com/pangding/web/company/service/CompanyRechargeService.java

+package com.pangding.web.company.service;
+
+import com.pangding.web.vo2.user.company.req.CompanyRechargeSaveReqVo;
+
+public interface CompanyRechargeService {
+
+    void saveCompanyRecharge(CompanyRechargeSaveReqVo req);
+
+}

src/main/java/com/pangding/web/company/service/impl/CompanyOtherMoneySavePdServiceImpl.java

@@ -6,6 +6,7 @@ import com.pangding.web.company.vo.CompanyOtherMoneyUtil;
 import com.pangding.web.constant.PangdConstant;
 import com.pangding.web.vo.system.pd.company.CompanyRelationVo;
 import com.pangding.web.vo2.user.company.pd.CompanyOtherMoneyVo;
+import com.pangding.web.vo2.user.company.pd.CompanyRechargeVo;
 import com.pangding.web.vo2.user.company.req.CompanyOtherMoneySaveReqVo;
 import com.yanzuoguang.util.base.ObjectHelper;
 import com.yanzuoguang.util.helper.DateHelper;
@@ -38,6 +39,12 @@ public class CompanyOtherMoneySavePdServiceImpl implements CompanyOtherMoneySave
                     companyOtherMoney.setCompanyOtherMoneyId(companyOtherMoneyId);
                     companyOtherMoney.setCreateTime(DateHelper.getNow());
                     temp.getCompanyOtherMoneyVoList().add(companyOtherMoney);
+
+                    CompanyRechargeVo companyRechargeVo = new CompanyRechargeVo();
+                    ObjectHelper.writeWithFromClass(companyRechargeVo, companyOtherMoneyVo);
+                    companyRechargeVo.setCompanyOtherMoneyId(companyOtherMoney.getCompanyOtherMoneyId());
+                    companyRechargeVo.setCreateTime(DateHelper.getNow());
+                    temp.getCompanyRechargeVoList().add(companyRechargeVo);
                 }
 
                 if (!StringHelper.isEmpty(req.getCompanyId())){

src/main/java/com/pangding/web/company/service/impl/CompanyOtherMoneyServiceImpl.java

@@ -16,6 +16,7 @@ import com.pangding.web.vo2.user.company.req.CompanyOtherMoneyUpdateReqVo;
 import com.pangding.web.vo2.user.company.res.CompanyOtherMoneyQueryResVo;
 import com.yanzuoguang.util.base.ObjectHelper;
 import com.yanzuoguang.util.exception.CodeException;
+import com.yanzuoguang.util.helper.JsonHelper;
 import com.yanzuoguang.util.helper.StringHelper;
 import com.yanzuoguang.util.vo.PageSizeData;
 import org.springframework.stereotype.Component;
@@ -127,6 +128,7 @@ public class CompanyOtherMoneyServiceImpl implements CompanyOtherMoenyService {
     }
 
     public String updateMoney(CompanyOtherMoneyUpdateReqVo req) {
+        System.err.println("处理余额开始：" + JsonHelper.serialize(req));
         CompanyOtherMoneyUpdateReqVo updateReq = new CompanyOtherMoneyUpdateReqVo();
         updateReq.setCompanyId(req.getCompanyId());
         updateReq.setMerchantId(req.getMerchantId());
@@ -143,6 +145,7 @@ public class CompanyOtherMoneyServiceImpl implements CompanyOtherMoenyService {
             superOther = req.getSuperOtherMoney();
         }
         updateReq.setOtherMoney(otherMoney);
+        System.err.println("处理分销商余额：" + JsonHelper.serialize(updateReq));
         companyOtherMoneyDao.updateMoney(updateReq);
 
         CompanyOtherMoneyVo companyOtherMoneyReqVo = new CompanyOtherMoneyVo();
@@ -161,6 +164,7 @@ public class CompanyOtherMoneyServiceImpl implements CompanyOtherMoenyService {
                     superUpdateReq.setCompanyId(companyRelationVo.getCompanyPid());
                     superUpdateReq.setMerchantId(req.getMerchantId());
                     superUpdateReq.setOtherMoney(superOther);
+                    System.err.println("处理代理商余额：" + JsonHelper.serialize(superUpdateReq));
                     companyOtherMoneyDao.updateMoney(superUpdateReq);
                 }
             }

src/main/java/com/pangding/web/company/service/impl/CompanyRechargeServiceImpl.java

+package com.pangding.web.company.service.impl;
+
+import com.pangding.web.company.dao.CompanyOtherMoneyDao;
+import com.pangding.web.company.dao.CompanyRechargeDao;
+import com.pangding.web.company.service.CompanyRechargeService;
+import com.pangding.web.vo2.user.company.pd.CompanyOtherMoneyVo;
+import com.pangding.web.vo2.user.company.pd.CompanyRechargeVo;
+import com.pangding.web.vo2.user.company.req.CompanyOtherMoneyUpdateReqVo;
+import com.pangding.web.vo2.user.company.req.CompanyRechargeSaveReqVo;
+import com.yanzuoguang.util.base.ObjectHelper;
+import com.yanzuoguang.util.helper.StringHelper;
+import org.springframework.stereotype.Component;
+
+@Component
+public class CompanyRechargeServiceImpl implements CompanyRechargeService {
+
+    private CompanyOtherMoneyDao companyOtherMoneyDao;
+
+    private CompanyRechargeDao companyRechargeDao;
+
+    public CompanyRechargeServiceImpl(CompanyOtherMoneyDao companyOtherMoneyDao, CompanyRechargeDao companyRechargeDao) {
+        this.companyOtherMoneyDao = companyOtherMoneyDao;
+        this.companyRechargeDao = companyRechargeDao;
+    }
+
+    public void saveCompanyRecharge(CompanyRechargeSaveReqVo req){
+        CompanyOtherMoneyVo moneyReq = new CompanyOtherMoneyVo();
+        moneyReq.setCompanyId(req.getCompanyId());
+        moneyReq.setMerchantId(req.getMerchantId());
+        moneyReq.setOtherMoneyType(req.getOtherMoneyType());
+        CompanyOtherMoneyVo companyOtherMoneyVo = companyOtherMoneyDao.load(moneyReq, CompanyOtherMoneyVo.class);
+        if(!StringHelper.isEmpty(companyOtherMoneyVo)){
+            CompanyOtherMoneyUpdateReqVo companyOtherMoneyUpdateReqVo = new CompanyOtherMoneyUpdateReqVo();
+            ObjectHelper.writeWithFromClass(companyOtherMoneyUpdateReqVo, companyOtherMoneyVo);
+            companyOtherMoneyUpdateReqVo.setOtherMoney(req.getOtherMoney());
+            companyOtherMoneyDao.updateMoney(companyOtherMoneyUpdateReqVo);
+
+            CompanyRechargeVo companyRechargeVo = new CompanyRechargeVo();
+            ObjectHelper.writeWithFromClass(companyRechargeVo, req);
+            companyRechargeVo.setCompanyOtherMoneyId(companyOtherMoneyVo.getCompanyOtherMoneyId());
+            companyRechargeVo.setCompanyRechargeId(StringHelper.getNewID());
+            companyRechargeDao.create(companyRechargeVo);
+        }
+
+    }
+
+}

src/main/java/com/pangding/web/company/vo/CompanyOtherMoneyTemp.java

@@ -2,6 +2,7 @@ package com.pangding.web.company.vo;
 
 import com.pangding.web.vo.system.pd.company.CompanyRelationVo;
 import com.pangding.web.vo2.user.company.pd.CompanyOtherMoneyVo;
+import com.pangding.web.vo2.user.company.pd.CompanyRechargeVo;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -12,6 +13,8 @@ public class CompanyOtherMoneyTemp {
 
     List<CompanyOtherMoneyVo> companyOtherMoneyVoList = new ArrayList<>();
 
+    List<CompanyRechargeVo> companyRechargeVoList = new ArrayList<>();
+
 
     public List<CompanyRelationVo> getCompanyRelationVoList() {
         return companyRelationVoList;
@@ -20,4 +23,8 @@ public class CompanyOtherMoneyTemp {
     public List<CompanyOtherMoneyVo> getCompanyOtherMoneyVoList() {
         return companyOtherMoneyVoList;
     }
+
+    public List<CompanyRechargeVo> getCompanyRechargeVoList() {
+        return companyRechargeVoList;
+    }
 }

src/main/java/com/pangding/web/company/web/CompanyRechargeController.java

+package com.pangding.web.company.web;
+
+import com.pangding.web.company.service.CompanyRechargeService;
+import com.pangding.web.vo2.user.company.req.CompanyRechargeSaveReqVo;
+import com.yanzuoguang.util.vo.ResponseResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping(value = "/companyRecharge", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+@Api(value = "代购公司余额充值记录管理", description = "代购公司余额充值记录管理")
+public class CompanyRechargeController {
+
+    private CompanyRechargeService companyRechargeService;
+
+    public CompanyRechargeController(CompanyRechargeService companyRechargeService) {
+        this.companyRechargeService = companyRechargeService;
+    }
+
+    @RequestMapping(value = "/saveCompanyRecharge")
+    @ApiOperation(value = "保存代购公司余额充值记录", notes = "返回成功")
+    public ResponseResult<String> saveCompanyRecharge(@RequestBody CompanyRechargeSaveReqVo req) {
+        companyRechargeService.saveCompanyRecharge(req);
+        return ResponseResult.result("返回成功");
+    }
+
+
+}