native支付接入

fs-company/src/main/java/com/fs/company/controller/CompanyRechargeController.java

@@ -13,6 +13,7 @@ import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.company.domain.Company;
 import com.fs.company.domain.CompanyRecharge;
+import com.fs.company.domain.CompanyRechargeOrder;
 import com.fs.company.dto.RechargeDTO;
 import com.fs.company.param.CompanyRechargeParam;
 import com.fs.company.service.ICompanyRechargeService;
@@ -80,16 +81,20 @@ public class CompanyRechargeController extends BaseController
      * 充值
      * @return AjaxResult
      */
-    @PostMapping("/recharge")
+    @PostMapping("/wxRecharge")
     public AjaxResult recharge(@RequestBody RechargeDTO dto){
-        String payLink;
+        CompanyRechargeOrder companyRechargeOrder;
         try {
-            payLink = companyRechargeService.recharge(dto);
+            LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+
+            dto.setCompanyId(loginUser.getCompany().getCompanyId());
+            dto.setUserId(loginUser.getUser().getUserId());
+            companyRechargeOrder = companyRechargeService.recharge(dto);
         }catch (Exception e) {
             logger.error("给公司充值失败",e);
             return AjaxResult.error(e.getMessage());
         }
-        return AjaxResult.success(payLink);
+        return AjaxResult.success(companyRechargeOrder);
     }
 
 

fs-service-system/src/main/java/com/fs/company/domain/CompanyRechargeOrder.java

@@ -42,6 +42,10 @@ public class CompanyRechargeOrder {
      */
     private BigDecimal payAmount;
 
+    private Long companyId;
+
+    private Long userId;
+
     /**
      * 支付状态：0-创建 1-处理中 2-支付成功 3-支付失败
      */
@@ -66,4 +70,6 @@ public class CompanyRechargeOrder {
      * 更新时间
      */
     private LocalDateTime updateTime;
+
+    private String qrLink;
 }

fs-service-system/src/main/java/com/fs/company/dto/RechargeDTO.java

@@ -10,5 +10,6 @@ public class RechargeDTO {
      * 充值金额
      */
     private BigDecimal amount;
-
+    private Long companyId;
+    private Long userId;
 }

fs-service-system/src/main/java/com/fs/company/mapper/CompanyRechargeOrderMapper.java

@@ -38,8 +38,8 @@ public interface CompanyRechargeOrderMapper {
     /**
      * 新增订单
      */
-    @Insert("INSERT INTO company_recharge_order (order_no, transaction_id, pay_type, pay_amount, pay_status, payment_time, callback_content) " +
-            "VALUES (#{orderNo}, #{transactionId}, #{payType}, #{payAmount}, #{payStatus}, #{paymentTime}, #{callbackContent})")
+    @Insert("INSERT INTO company_recharge_order (order_no, transaction_id, pay_type, pay_amount, pay_status, payment_time, callback_content,company_id,user_id) " +
+            "VALUES (#{orderNo}, #{transactionId}, #{payType}, #{payAmount}, #{payStatus}, #{paymentTime}, #{callbackContent},#{companyId},#{userId})")
     @Options(useGeneratedKeys = true, keyProperty = "id")
     int insert(CompanyRechargeOrder order);
 

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

@@ -10,5 +10,5 @@ public interface CompanyRechargeOrderService {
 
     void autoClosedOrder();
 
-    String createOrder(CompanyRechargeOrder order) throws Exception;
+    CompanyRechargeOrder createOrder(CompanyRechargeOrder order) throws Exception;
 }

fs-service-system/src/main/java/com/fs/company/service/ICompanyRechargeService.java

@@ -5,6 +5,7 @@ import java.util.List;
 
 import com.fs.common.core.domain.R;
 import com.fs.company.domain.CompanyRecharge;
+import com.fs.company.domain.CompanyRechargeOrder;
 import com.fs.company.dto.RechargeDTO;
 import com.fs.company.vo.CompanyRechargeExportVO;
 import com.fs.company.vo.CompanyRechargeVO;
@@ -87,5 +88,5 @@ public interface ICompanyRechargeService
      * @param dto 参数
      * @return 地址
      */
-    String recharge(RechargeDTO dto) throws Exception;
+    CompanyRechargeOrder recharge(RechargeDTO dto) throws Exception;
 }

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

@@ -52,7 +52,7 @@ public class CompanyRechargeOrderServiceImpl implements CompanyRechargeOrderServ
 
     @Override
     @Transactional(rollbackFor = Throwable.class,propagation = Propagation.REQUIRED)
-    public String createOrder(CompanyRechargeOrder order) throws Exception{
+    public CompanyRechargeOrder createOrder(CompanyRechargeOrder order) throws Exception{
 
         WxPayConfig payConfig = new WxPayConfig();
         payConfig.setAppId(wxPayProperties.getAppId());
@@ -85,11 +85,11 @@ public class CompanyRechargeOrderServiceImpl implements CompanyRechargeOrderServ
         order.setPayStatus(1);
         order.setCreateTime(LocalDateTime.now());
         order.setCallbackContent(JSON.toJSONString(wxOrder));
-
+        order.setQrLink(wxOrder.getCodeUrl());
 
         companyRechargeOrderMapper.insert(order);
 
-        return wxOrder.getCodeUrl();
+        return order;
     }
 
 

fs-service-system/src/main/java/com/fs/company/service/impl/CompanyRechargeServiceImpl.java

@@ -38,7 +38,7 @@ public class CompanyRechargeServiceImpl implements ICompanyRechargeService
     private CompanyMoneyLogsMapper moneyLogsMapper;
     @Autowired
     private CompanyMapper companyMapper;
-
+    @Autowired
     private CompanyRechargeOrderService companyRechargeOrderService;
     /**
      * 查询充值
@@ -159,9 +159,11 @@ public class CompanyRechargeServiceImpl implements ICompanyRechargeService
 
     @Override
     @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Throwable.class)
-    public String recharge(RechargeDTO dto) throws Exception {
+    public CompanyRechargeOrder recharge(RechargeDTO dto) throws Exception {
         CompanyRechargeOrder order = new CompanyRechargeOrder();
         order.setPayAmount(dto.getAmount());
+        order.setCompanyId(dto.getCompanyId());
+        order.setUserId(dto.getUserId());
         return companyRechargeOrderService.createOrder(order);
     }
 }

fs-service-system/src/main/resources/application-config-fby.yml

@@ -94,7 +94,7 @@ wx:
     privateKeyPath: 'C:\cert\1716217886_20250509_cert\apiclient_key.pem'
     privateCertPath: 'C:\cert\1716217886_20250509_cert\apiclient_cert.pem'
     certSerialNo: '4E8BD68BC2BFD37CA58244D660E5FDCCE475D82E'
-    nativeNotifyUrl: ''
+    nativeNotifyUrl: 'https://userapp.bly.ylrztop.com/app/wxpay/wxPayNotify'
   mp:
     useRedis: false
     redisConfig:
@@ -123,3 +123,5 @@ tencent_cloud_config:
   proxy: fby
 cloud_host:
   company_name: 福本源
+headerImg:
+  imgUrl: