修改bug

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

@@ -10,7 +10,6 @@ import com.mmc.iuav.user.model.vo.wallet.WalletFlowVO;
 import com.mmc.iuav.user.service.wallet.PayWalletService;
 import io.swagger.annotations.*;
 import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -59,8 +58,7 @@ public class PayWalletController extends BaseController {
         return payWalletService.feignTopUpCash(topUpOrderVO);
     }
 
-
-    @ApiIgnore
+    
     @ApiOperation(value = "feign-钱包流水记录")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @PostMapping("feignWalletFlow")

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

@@ -86,33 +86,28 @@ public class PayWalletServiceImpl implements PayWalletService {
         }
         // 判断状态进行资金的扣减等于100时 发布订单
         if (publisherWalletFlowVO != null && publisherWalletFlowVO.getModeOfPayment().equals(PayMethodEnums.PUBLISH_ORDER.getCode())) {
-            if (publisherWalletFlowVO.getCashAmount().compareTo(new BigDecimal(0)) > 0 ||
-                    publisherWalletFlowVO.getSalaryAmount().compareTo(new BigDecimal(0)) > 0) {
-                PayWalletDO publishUpdatePayWallet = new PayWalletDO();
-                publishUpdatePayWallet.setUserAccountId(publisherWalletFlowVO.getUserAccountId());
-                publishUpdatePayWallet.setPid(publishWallet.getPid());
-                publishUpdatePayWallet.setCashAmt(publishWallet.getCashAmt().add(publisherWalletFlowVO.getCashAmount())
-                        .add(publisherWalletFlowVO.getTopYxjAmount()).add(publisherWalletFlowVO.getUrgentYxjAmount()));
-                publishUpdatePayWallet.setCashFreeze(publishWallet.getCashFreeze().subtract(publisherWalletFlowVO.getCashAmount())
-                        .subtract(publisherWalletFlowVO.getTopYxjAmount()).subtract(publisherWalletFlowVO.getUrgentYxjAmount()));
-                publishUpdatePayWallet.setSalaryAmt(publishWallet.getSalaryAmt().add(publisherWalletFlowVO.getSalaryAmount())
-                        .add(publisherWalletFlowVO.getTopSalaryAmount()).add(publisherWalletFlowVO.getUrgentSalaryAmount()));
-                publishUpdatePayWallet.setSalaryFreeze(publishWallet.getSalaryFreeze().subtract(publisherWalletFlowVO.getSalaryAmount())
-                        .subtract(publisherWalletFlowVO.getTopSalaryAmount()).subtract(publisherWalletFlowVO.getUrgentSalaryAmount()));
-                int i = payWalletDao.updatePayWallet(publishUpdatePayWallet);
-                if (i > 0) {
-                    PayLogDO payLogDO = buildPayLogDO(publisherWalletFlowVO, null);
-                    payLogDO.setCashAmtPaid(publisherWalletFlowVO.getCashAmount().add(publisherWalletFlowVO.getTopYxjAmount()).add(publisherWalletFlowVO.getUrgentYxjAmount()));
-                    payLogDO.setSalaryAmtPaid(publisherWalletFlowVO.getSalaryAmount().add(publisherWalletFlowVO.getTopSalaryAmount()).add(publisherWalletFlowVO.getUrgentSalaryAmount()));
-                    // 插入流水记录表
-                    payWalletDao.insertPayLogDO(payLogDO);
-                    return ResultBody.success();
-                } else {
-                    log.error("发布订单时，用户钱包更新失败，用户id是:{}，传入参数是：{}", publisherWalletFlowVO.getUserAccountId(), publisherWalletFlowVO);
-                    return ResultBody.error("钱包操作错误");
-                }
-            } else {
+            PayWalletDO publishUpdatePayWallet = new PayWalletDO();
+            publishUpdatePayWallet.setUserAccountId(publisherWalletFlowVO.getUserAccountId());
+            publishUpdatePayWallet.setPid(publishWallet.getPid());
+            publishUpdatePayWallet.setCashAmt(publishWallet.getCashAmt().add(publisherWalletFlowVO.getCashAmount())
+                    .add(publisherWalletFlowVO.getTopYxjAmount()).add(publisherWalletFlowVO.getUrgentYxjAmount()));
+            publishUpdatePayWallet.setCashFreeze(publishWallet.getCashFreeze().subtract(publisherWalletFlowVO.getCashAmount())
+                    .subtract(publisherWalletFlowVO.getTopYxjAmount()).subtract(publisherWalletFlowVO.getUrgentYxjAmount()));
+            publishUpdatePayWallet.setSalaryAmt(publishWallet.getSalaryAmt().add(publisherWalletFlowVO.getSalaryAmount())
+                    .add(publisherWalletFlowVO.getTopSalaryAmount()).add(publisherWalletFlowVO.getUrgentSalaryAmount()));
+            publishUpdatePayWallet.setSalaryFreeze(publishWallet.getSalaryFreeze().subtract(publisherWalletFlowVO.getSalaryAmount())
+                    .subtract(publisherWalletFlowVO.getTopSalaryAmount()).subtract(publisherWalletFlowVO.getUrgentSalaryAmount()));
+            int i = payWalletDao.updatePayWallet(publishUpdatePayWallet);
+            if (i > 0) {
+                PayLogDO payLogDO = buildPayLogDO(publisherWalletFlowVO, null);
+                payLogDO.setCashAmtPaid(publisherWalletFlowVO.getCashAmount().add(publisherWalletFlowVO.getTopYxjAmount()).add(publisherWalletFlowVO.getUrgentYxjAmount()));
+                payLogDO.setSalaryAmtPaid(publisherWalletFlowVO.getSalaryAmount().add(publisherWalletFlowVO.getTopSalaryAmount()).add(publisherWalletFlowVO.getUrgentSalaryAmount()));
+                // 插入流水记录表
+                payWalletDao.insertPayLogDO(payLogDO);
                 return ResultBody.success();
+            } else {
+                log.error("发布订单时，用户钱包更新失败，用户id是:{}，传入参数是：{}", publisherWalletFlowVO.getUserAccountId(), publisherWalletFlowVO);
+                return ResultBody.error("钱包操作错误");
             }
         } else if (publisherWalletFlowVO != null && publisherWalletFlowVO.getModeOfPayment().equals(PayMethodEnums.CANCEL_ORDER_TAKING.getCode())) {
             // 等于200时 发布方取消订单，无飞手接单