fix: 充值回调

fs-service/src/main/java/com/fs/company/service/CompanyRechargeOrderService.java

@@ -13,4 +13,7 @@ public interface CompanyRechargeOrderService {
     CompanyRechargeOrder createOrder(CompanyRechargeOrder order) throws Exception;
 
     CompanyRechargeOrder queryOrder(String orderNo);
+
+
+    String payConfirm(String payCode,String tradeNo,String bankTransactionId,String bankSerialNo,String content);
 }

fs-service/src/main/java/com/fs/company/service/impl/CompanyRechargeOrderServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fs.company.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.fs.common.utils.IpUtil;
 import com.fs.company.constant.PaymentStatus;
 import com.fs.company.domain.CompanyRechargeOrder;
@@ -8,6 +9,8 @@ import com.fs.company.mapper.CompanyRechargeOrderMapper;
 import com.fs.company.util.OrderUtils;
 import com.fs.company.service.CompanyRechargeOrderService;
 import com.fs.core.config.WxPayProperties;
+import com.fs.his.domain.FsUser;
+import com.fs.his.mapper.FsUserMapper;
 import com.github.binarywang.wxpay.bean.order.WxPayNativeOrderResult;
 import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
 import com.github.binarywang.wxpay.config.WxPayConfig;
@@ -33,6 +36,9 @@ public class CompanyRechargeOrderServiceImpl implements CompanyRechargeOrderServ
 
     @Autowired
     private WxPayService wxPayService;
+
+    @Autowired
+    private FsUserMapper fsUserMapper;
     @Override
     public List<CompanyRechargeOrder> queryOverdueOrder() {
         return companyRechargeOrderMapper.queryOverdueOrder();
@@ -50,6 +56,8 @@ public class CompanyRechargeOrderServiceImpl implements CompanyRechargeOrderServ
         }
     }
 
+
+
     @Override
     @Transactional(rollbackFor = Throwable.class,propagation = Propagation.REQUIRED)
     public CompanyRechargeOrder createOrder(CompanyRechargeOrder order) throws Exception{
@@ -97,5 +105,22 @@ public class CompanyRechargeOrderServiceImpl implements CompanyRechargeOrderServ
         return companyRechargeOrderMapper.selectByOrderNo(orderNo);
     }
 
+    @Override
+    public String payConfirm(String payCode, String tradeNo, String bankTransactionId, String bankSerialNo,String content) {
+        CompanyRechargeOrder order = companyRechargeOrderMapper.selectByOrderNo(payCode);
+        order.setPayStatus(2);
+        order.setTransactionId(bankTransactionId);
+        order.setCallbackContent(content);
+        companyRechargeOrderMapper.updateByOrderNo(order);
+        FsUser user = fsUserMapper.selectFsUserByUserIdForUpdate(order.getUserId());
+        BigDecimal money = user.getMoney();
+        if(ObjectUtils.isNull(money)) {
+            money = BigDecimal.ZERO;
+        }
+        user.setMoney(money.add(order.getPayAmount()));
+        fsUserMapper.updateFsUser(user);
+        return "SUCCESS";
+    }
+
 
 }

fs-user-app/src/main/java/com/fs/app/controller/store/PayScrmController.java

@@ -67,6 +67,9 @@ public class PayScrmController {
     @Autowired
     private ICompanyUserService companyUserService;
 
+    @Autowired
+    private IFsStorePaymentScrmService fsStorePaymentScrmService;
+
     @ApiOperation("汇付第三方支付回调")
     @PostMapping(value="/hfPayNotify")
     public String hfPayNotify(@RequestParam String resp_desc, @RequestParam String resp_code, @RequestParam String sign, @RequestParam String resp_data) throws Exception {
@@ -82,6 +85,8 @@ public class PayScrmController {
                     return orderService.payRemainConfirm( order[1], o.getHf_seq_id(),o.getOut_trans_id(),o.getParty_order_id());
                 case "payment":
                     return storePaymentService.payConfirm(order[1],o.getHf_seq_id(),o.getOut_trans_id(),o.getParty_order_id());
+                case "recharge":
+                    return fsStorePaymentScrmService.payConfirm(order[1],o.getHf_seq_id(),o.getOut_trans_id(),resp_data);
             }
 
         }