bug修复

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/wallet/PayWalletController.java

@@ -88,7 +88,7 @@ public class PayWalletController extends BaseController {
         return payWalletService.billingDetails(id, detailType);
     }
 
-    @ApiOperation(value = "商城订单钱包流水加扣记录", hidden = true)
+    @ApiOperation(value = "商城订单钱包流水加扣记录")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @PostMapping("feignPayUavWallet")
     public ResultBody payUavWallet(@RequestBody PayUavWalletVO payUavWalletVO) {

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/wallet/impl/PayWalletServiceImpl.java

@@ -646,7 +646,9 @@ public class PayWalletServiceImpl implements PayWalletService {
         }
         // 如果是100 扣减余额冻结金额
         payWalletDO.setCashAmt(userWalletInfo.getCashAmt().subtract(payUavWalletVO.getCashAmount()));
-        payWalletDO.setCashFreeze(userWalletInfo.getCashAmt().add(payUavWalletVO.getCashAmount()));
+        payWalletDO.setCashFreeze(userWalletInfo.getCashFreeze().add(payUavWalletVO.getCashAmount()));
+        payWalletDO.setSalaryAmt(userWalletInfo.getSalaryAmt().subtract(payUavWalletVO.getSalaryAmount()));
+        payWalletDO.setSalaryFreeze(userWalletInfo.getSalaryFreeze().add(payUavWalletVO.getSalaryAmount()));
         payWalletDao.insertPayLogDO(payLogDO);
         payWalletDao.updatePayWallet(payWalletDO);
         return ResultBody.success();
@@ -659,7 +661,9 @@ public class PayWalletServiceImpl implements PayWalletService {
         payLogDO.setSalaryAmtPaid(payUavWalletVO.getSalaryAmount());
         // 如果是1400 回滚解冻金额
         payWalletDO.setCashAmt(userWalletInfo.getCashAmt().add(payUavWalletVO.getCashAmount()));
-        payWalletDO.setCashFreeze(userWalletInfo.getCashAmt().subtract(payUavWalletVO.getCashAmount()));
+        payWalletDO.setCashFreeze(userWalletInfo.getCashFreeze().subtract(payUavWalletVO.getCashAmount()));
+        payWalletDO.setSalaryAmt(userWalletInfo.getSalaryAmt().add(payUavWalletVO.getSalaryAmount()));
+        payWalletDO.setSalaryFreeze(userWalletInfo.getSalaryFreeze().subtract(payUavWalletVO.getSalaryAmount()));
         payWalletDao.insertPayLogDO(payLogDO);
         payWalletDao.updatePayWallet(payWalletDO);
         return ResultBody.success();