Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/controller/mac/AccountController.java

@@ -11,8 +11,8 @@ import com.dk.mdm.service.mac.AccountService;
 
 @Api(tags = "账款对象API接口")
 @RestController
-@RequestMapping("/account")
-public class AccountController{
+@RequestMapping("/mac/account")
+public class AccountController extends BaseController<Account>{
 
     public BaseService<Account> getService() {
         return accountService;

src/main/java/com/dk/mdm/service/mac/RecPayService.java

@@ -1,9 +1,12 @@
 package com.dk.mdm.service.mac;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.dk.common.exception.BaseBusinessException;
 import com.dk.common.infrastructure.annotaiton.Pagination;
 import com.dk.common.infrastructure.constant.Constant;
+import com.dk.common.infrastructure.enums.ErrorCodeEnum;
 import com.dk.common.model.pojo.PageList;
+import com.dk.common.response.ResponseCodeEnum;
 import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.infrastructure.convert.mac.RecPayConvert;
@@ -177,7 +180,10 @@ public class RecPayService extends BaseService<RecPay> {
     public ResponseResultVO<?> insertRefund(RecPayVO recPayVO) {
 
         // 查总账，看可退金额是否满足
-
+        Account accountForUpdate = accountMapper.selectByIdForUpdate(recPayVO.getObjectId());
+        if (accountForUpdate == null || accountForUpdate.getReceiptResidue().compareTo(recPayVO.getSumAmtRec().abs()) == -1) {
+            throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.RESIDUE_NO_LESS.getMessage());
+        }
 
         // 获取单号
         Map<String, Object> codeMap = commonService.getUniqueNoteCode(Constant.docNameConstant.RECPAY.getName(), false);
@@ -210,17 +216,6 @@ public class RecPayService extends BaseService<RecPay> {
             }
         }
 
-        // 插入账款总表
-        Account accountForUpdate = accountMapper.selectByIdForUpdate(recPayVO.getObjectId());
-
-        // 没有账款对象，需要新建
-        if (accountForUpdate == null) {
-            accountForUpdate = new Account();
-            accountForUpdate.setObjectId(recPayVO.getObjectId()).setObjectType(Constant.ObjectType.CUS.getName());
-            accountMapper.insert(accountForUpdate);
-            accountForUpdate = accountMapper.selectByIdForUpdate(recPayVO.getObjectId());
-        }
-
         // 更新账款总表上收款的相关字段
         Account accountUpdate = new Account();
         accountUpdate.setReceipt(accountForUpdate.getReceipt().add(recPayVO.getSumAmtRec()))// 总收款金额