支付回调添加交易单号和银行流水单号

fs-admin/src/main/java/com/fs/his/task/Task.java

@@ -802,7 +802,7 @@ public class Task {
 
 
     public void tb() {
-        packageOrderService.payConfirm("", "1780763211956486144", "1075999515888117190", "14", 1);
+        packageOrderService.payConfirm("", "1780763211956486144", "1075999515888117190", "14", 1,null,null);
     }
 
 

fs-service/src/main/java/com/fs/course/service/IFsCourseProductOrderService.java

@@ -16,14 +16,14 @@ import com.fs.his.param.FsCourseProductOrderRefundParam;
 
 /**
  * 拍单商品订单Service接口
- * 
+ *
  * @author fs
  * @date 2025-07-28
  */
 public interface IFsCourseProductOrderService extends IService<FsCourseProductOrder>{
     /**
      * 查询拍单商品订单
-     * 
+     *
      * @param courseOrderId 拍单商品订单主键
      * @return 拍单商品订单
      */
@@ -31,7 +31,7 @@ public interface IFsCourseProductOrderService extends IService<FsCourseProductOr
 
     /**
      * 查询拍单商品订单列表
-     * 
+     *
      * @param param 拍单商品订单
      * @return 拍单商品订单集合
      */
@@ -39,7 +39,7 @@ public interface IFsCourseProductOrderService extends IService<FsCourseProductOr
 
     /**
      * 新增拍单商品订单
-     * 
+     *
      * @param fsCourseProductOrder 拍单商品订单
      * @return 结果
      */
@@ -47,7 +47,7 @@ public interface IFsCourseProductOrderService extends IService<FsCourseProductOr
 
     /**
      * 修改拍单商品订单
-     * 
+     *
      * @param fsCourseProductOrder 拍单商品订单
      * @return 结果
      */
@@ -55,7 +55,7 @@ public interface IFsCourseProductOrderService extends IService<FsCourseProductOr
 
     /**
      * 批量删除拍单商品订单
-     * 
+     *
      * @param courseOrderIds 需要删除的拍单商品订单主键集合
      * @return 结果
      */
@@ -63,7 +63,7 @@ public interface IFsCourseProductOrderService extends IService<FsCourseProductOr
 
     /**
      * 删除拍单商品订单信息
-     * 
+     *
      * @param courseOrderId 拍单商品订单主键
      * @return 结果
      */
@@ -79,7 +79,7 @@ public interface IFsCourseProductOrderService extends IService<FsCourseProductOr
 
     R payment(FsCourseProductOrderDoPayParam param);
 
-    R  payConfirm(String orderSn,String payCode, String tradeNo,String payType,Integer type);
+    R  payConfirm(String orderSn,String payCode, String tradeNo,String payType,Integer type,String bankTransactionId,String bankSerialNo);
 
     R refund(FsCourseProductOrderRefundParam param);
 

fs-service/src/main/java/com/fs/course/service/IFsUserCourseOrderService.java

@@ -73,7 +73,7 @@ public interface IFsUserCourseOrderService
 
     R payment(FsUserCourseOrderDoPayParam param);
 
-    R  payConfirm(String orderSn,String payCode, String tradeNo,String payType,Integer type);
+    R  payConfirm(String orderSn,String payCode, String tradeNo,String payType,Integer type,String bankTransactionId,String bankSerialNo);
 
     R computeOrder(FsUserCourseOrderComputeParam param);
 

fs-service/src/main/java/com/fs/course/service/IFsUserVipOrderService.java

@@ -75,7 +75,7 @@ public interface IFsUserVipOrderService
 
     R payment(FsUserVipOrderPayUParam param);
 
-    R payConfirm(String orderSn,String payCode, String tradeNo,String payType,Integer type);
+    R payConfirm(String orderSn,String payCode, String tradeNo,String payType,Integer type,String bankTransactionId,String bankSerialNo);
 
     R aliPayment(FsUserVipOrderPayUParam param);
 }

fs-service/src/main/java/com/fs/course/service/impl/FsCourseProductOrderServiceImpl.java

@@ -76,7 +76,7 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 /**
  * 拍单商品订单Service业务层处理
- * 
+ *
  * @author fs
  * @date 2025-07-28
  */
@@ -131,7 +131,7 @@ public class FsCourseProductOrderServiceImpl extends ServiceImpl<FsCourseProduct
 
     /**
      * 查询拍单商品订单
-     * 
+     *
      * @param courseOrderId 拍单商品订单主键
      * @return 拍单商品订单
      */
@@ -143,7 +143,7 @@ public class FsCourseProductOrderServiceImpl extends ServiceImpl<FsCourseProduct
 
     /**
      * 查询拍单商品订单列表
-     * 
+     *
      * @param param 拍单商品订单
      * @return 拍单商品订单
      */
@@ -171,7 +171,7 @@ public class FsCourseProductOrderServiceImpl extends ServiceImpl<FsCourseProduct
 
     /**
      * 新增拍单商品订单
-     * 
+     *
      * @param fsCourseProductOrder 拍单商品订单
      * @return 结果
      */
@@ -184,7 +184,7 @@ public class FsCourseProductOrderServiceImpl extends ServiceImpl<FsCourseProduct
 
     /**
      * 修改拍单商品订单
-     * 
+     *
      * @param fsCourseProductOrder 拍单商品订单
      * @return 结果
      */
@@ -197,7 +197,7 @@ public class FsCourseProductOrderServiceImpl extends ServiceImpl<FsCourseProduct
 
     /**
      * 批量删除拍单商品订单
-     * 
+     *
      * @param courseOrderIds 需要删除的拍单商品订单主键
      * @return 结果
      */
@@ -209,7 +209,7 @@ public class FsCourseProductOrderServiceImpl extends ServiceImpl<FsCourseProduct
 
     /**
      * 删除拍单商品订单信息
-     * 
+     *
      * @param courseOrderId 拍单商品订单主键
      * @return 结果
      */
@@ -445,7 +445,7 @@ public class FsCourseProductOrderServiceImpl extends ServiceImpl<FsCourseProduct
     }
 
     @Override
-    public R payConfirm(String orderSn, String payCode, String tradeNo, String payType, Integer type) {
+    public R payConfirm(String orderSn, String payCode, String tradeNo, String payType, Integer type,String bankTransactionId,String bankSerialNo){
         logger.info("进入拍商品订单支付回调 orderSn: {}, payCode: {}, tradeNo: {}, payType: {}, type: {}",
                 orderSn, payCode, tradeNo, payType, type);
         FsCourseProductOrder order = null;
@@ -458,6 +458,8 @@ public class FsCourseProductOrderServiceImpl extends ServiceImpl<FsCourseProduct
                     paymentMap.setStatus(1);
                     paymentMap.setPayTime(new Date());
                     paymentMap.setTradeNo(tradeNo);
+                    paymentMap.setBankSerialNo(bankSerialNo);
+                    paymentMap.setBankTransactionId(bankTransactionId);
                     if(payType.equals(PayType.WECHAT_MINI_PROGRAM_PAYMENT.getCode())){
                         paymentMap.setPayTypeCode(PayType.WECHAT_MINI_PROGRAM_PAYMENT.name());
                     }

fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseOrderServiceImpl.java

@@ -390,7 +390,7 @@ public class FsUserCourseOrderServiceImpl implements IFsUserCourseOrderService
 
         if(user!=null&& StringUtils.isNotEmpty(openId)) {
             if (order.getPayMoney().compareTo(new BigDecimal(0)) == 0) {
-                this.payConfirm(order.getOrderCode(), "", "", "", 2);
+                this.payConfirm(order.getOrderCode(), "", "", "", 2,null,null);
                 return R.ok().put("isPay", 1);
             } else {
                 String payCode =  OrderCodeUtils.getOrderSn();
@@ -584,7 +584,7 @@ public class FsUserCourseOrderServiceImpl implements IFsUserCourseOrderService
                 }
             }
             else{
-                this.payConfirm(order.getOrderCode(),"","","",2);
+                this.payConfirm(order.getOrderCode(),"","","",2,null,null);
                 return R.ok().put("isPay",1);
             }
         }
@@ -596,7 +596,7 @@ public class FsUserCourseOrderServiceImpl implements IFsUserCourseOrderService
 
     @Override
     @Transactional
-    public R payConfirm(String orderSn, String payCode, String tradeNo, String payType, Integer type) {
+    public R payConfirm(String orderSn, String payCode, String tradeNo, String payType, Integer type,String bankTransactionId,String bankSerialNo){
         Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
         try {
             FsUserCourseOrder order=null;
@@ -609,6 +609,8 @@ public class FsUserCourseOrderServiceImpl implements IFsUserCourseOrderService
                         paymentMap.setStatus(1);
                         paymentMap.setPayTime(new Date());
                         paymentMap.setTradeNo(tradeNo);
+                        paymentMap.setBankSerialNo(bankSerialNo);
+                        paymentMap.setBankTransactionId(bankTransactionId);
                         if(payType.equals(PayType.WECHAT_MINI_PROGRAM_PAYMENT.getCode())){
                             paymentMap.setPayTypeCode(PayType.WECHAT_MINI_PROGRAM_PAYMENT.name());
                         }

fs-service/src/main/java/com/fs/course/service/impl/FsUserVipOrderServiceImpl.java

@@ -249,7 +249,7 @@ public class FsUserVipOrderServiceImpl implements IFsUserVipOrderService
 
         if(user!=null&& StringUtils.isNotEmpty(openId)) {
             if (order.getPayMoney().compareTo(new BigDecimal(0)) == 0) {
-                this.payConfirm(order.getOrderCode(), "", "", "", 2);
+                this.payConfirm(order.getOrderCode(), "", "", "", 2,null,null);
                 return R.ok().put("isPay", 1);
             } else {
                 String payCode =  OrderCodeUtils.getOrderSn();
@@ -434,7 +434,7 @@ public class FsUserVipOrderServiceImpl implements IFsUserVipOrderService
                 }
             }
             else{
-                this.payConfirm(order.getOrderCode(),"","","",2);
+                this.payConfirm(order.getOrderCode(),"","","",2,null,null);
                 return R.ok().put("isPay",1);
             }
         }
@@ -446,7 +446,7 @@ public class FsUserVipOrderServiceImpl implements IFsUserVipOrderService
 
     @Override
     @Transactional
-    public R payConfirm(String orderSn, String payCode, String tradeNo, String payType, Integer type) {
+    public R payConfirm(String orderSn, String payCode, String tradeNo, String payType, Integer type,String bankTransactionId,String bankSerialNo){
         Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
         try {
             FsUserVipOrder order=null;
@@ -459,6 +459,8 @@ public class FsUserVipOrderServiceImpl implements IFsUserVipOrderService
                         paymentMap.setStatus(1);
                         paymentMap.setPayTime(new Date());
                         paymentMap.setTradeNo(tradeNo);
+                        paymentMap.setBankSerialNo(bankSerialNo);
+                        paymentMap.setBankTransactionId(bankTransactionId);
                         if(payType.equals(PayType.WECHAT_MINI_PROGRAM_PAYMENT.getCode())){
                             paymentMap.setPayTypeCode(PayType.WECHAT_MINI_PROGRAM_PAYMENT.name());
                         }

fs-service/src/main/java/com/fs/his/mapper/FsStorePaymentMapper.java

@@ -175,7 +175,7 @@ public interface FsStorePaymentMapper
     @Select("select * from fs_store_payment where business_type=#{type} and  business_id=#{businessId} and (status=1 or starus=-1)")
     List<FsStorePayment> selectFsStorePaymentByPayOrRefund(int i, Long orderId);
     @Select({"<script> " +
-            " SELECT sp.*,u.nick_name,u.phone,s.store_name,c.company_name,cu.nick_name as companyUserName,fso.delivery_name,fso.package_name,fso.package_second_name FROM fs_store_payment sp " +
+            " SELECT CONCAT('package-', sp.business_code) AS business_code,sp.*,u.nick_name,u.phone,s.store_name,c.company_name,cu.nick_name as companyUserName,fso.delivery_name,fso.package_name,fso.package_second_name FROM fs_store_payment sp " +
             " LEFT JOIN  fs_user u ON u.user_id=sp.user_id " +
             " LEFT JOIN fs_store s ON s.store_id=sp.store_id " +
             " left join fs_store_order fso on fso.order_code = sp.business_code " +

fs-service/src/main/java/com/fs/his/service/IFsInquiryOrderService.java

@@ -75,7 +75,7 @@ public interface IFsInquiryOrderService
 
     R createOrder(FsInquiryOrderCreateParam param);
 
-    R payConfirm(String orderSn,String payCode, String tradeNo,String payType,Integer type);
+    R payConfirm(String orderSn,String payCode, String tradeNo,String payType,Integer type,String bankTransactionId,String bankSerialNo);
 
     R confirmOrder(FsInquiryOrderConfirmParam param);
 

fs-service/src/main/java/com/fs/his/service/IFsIntegralOrderService.java

@@ -99,5 +99,5 @@ public interface IFsIntegralOrderService
     /**
      * 支付回调
      */
-    R payConfirm(String orderSn, String payCode, String tradeNo, String payType, int type);
+    R payConfirm(String orderSn, String payCode, String tradeNo, String payType, int type,String bankTransactionId,String bankSerialNo);
 }

fs-service/src/main/java/com/fs/his/service/IFsPackageOrderService.java

@@ -83,7 +83,8 @@ public interface IFsPackageOrderService
 
     R payOrder(FsPackageOrderPayParam param);
 
-    R  payConfirm(String orderSn,String payCode, String tradeNo,String payType,Integer type);
+//    R  payConfirm(String orderSn,String payCode, String tradeNo,String payType,Integer type);
+    R  payConfirm(String orderSn,String payCode, String tradeNo,String payType,Integer type,String bankTransactionId,String bankSerialNo);
 
     List<FsPackageOrderListUVO> selectFsPackageOrderListUVO(FsPackageOrderListUParam param);
 

fs-service/src/main/java/com/fs/his/service/IFsStoreOrderService.java

@@ -107,7 +107,7 @@ public interface IFsStoreOrderService
 
     R createOrderByPackageOrder(FsPackageOrder packageOrder);
 
-    R payConfirm(String orderCode,String payCode, String tradeNo,String payType,Integer type);
+    R payConfirm(String orderCode,String payCode, String tradeNo,String payType,Integer type,String bankTransactionId,String bankSerialNo);
 
     List<FsStoreOrderExcelVO> selectFsStoreOrderExcelListVO(FsStoreOrderParam fsStoreOrder);
 

fs-service/src/main/java/com/fs/his/service/impl/FsExportTaskServiceImpl.java

@@ -15,10 +15,7 @@ import com.fs.his.param.FsStoreOrderParam;
 import com.fs.his.param.FsStorePaymentParam;
 import com.fs.his.service.IFsStoreOrderService;
 import com.fs.his.utils.PhoneUtil;
-import com.fs.his.vo.FsStoreOrderErpExportVO;
-import com.fs.his.vo.FsStoreOrderExcelVO;
-import com.fs.his.vo.FsStoreOrderExportVO;
-import com.fs.his.vo.FsStorePaymentExcelVO;
+import com.fs.his.vo.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
@@ -211,7 +208,6 @@ public class FsExportTaskServiceImpl implements IFsExportTaskService
             task.setStatus(1);
             task.setFileUrl(result.get("msg").toString());
             fsExportTaskMapper.updateFsExportTask(task);
-
     }
 
     @Override

fs-service/src/main/java/com/fs/his/service/impl/FsInquiryOrderServiceImpl.java

@@ -730,7 +730,7 @@ public class FsInquiryOrderServiceImpl implements IFsInquiryOrderService
 
     @Override
     @Transactional
-    public R payConfirm(String orderSn,String payCode, String tradeNo,String payType,Integer type) {
+    public R payConfirm(String orderSn,String payCode, String tradeNo,String payType,Integer type,String bankTransactionId,String bankSerialNo) {
         try {
             FsInquiryOrder order;
             if(type.equals(1)){
@@ -742,6 +742,8 @@ public class FsInquiryOrderServiceImpl implements IFsInquiryOrderService
                         paymentMap.setStatus(1);
                         paymentMap.setPayTime(new Date());
                         paymentMap.setTradeNo(tradeNo);
+                        paymentMap.setBankSerialNo(bankSerialNo);
+                        paymentMap.setBankTransactionId(bankTransactionId);
                         if(payType.equals(PayType.WECHAT_MINI_PROGRAM_PAYMENT.getCode())){
                             paymentMap.setPayTypeCode(PayType.WECHAT_MINI_PROGRAM_PAYMENT.name());
                         }
@@ -1642,7 +1644,7 @@ public class FsInquiryOrderServiceImpl implements IFsInquiryOrderService
             fsPackageOrder.setOrderId(packageOrder.getOrderId());
             fsPackageOrder.setInquiryOrderId(order.getOrderId());
             fsPackageOrderMapper.updateFsPackageOrder(fsPackageOrder);
-            this.payConfirm(packageOrder.getOrderSn(),"","","",2);
+            this.payConfirm(packageOrder.getOrderSn(),"","","",2,null,null);
             return R.ok();
         }
         else{

fs-service/src/main/java/com/fs/his/service/impl/FsIntegralOrderServiceImpl.java

@@ -519,7 +519,7 @@ public class FsIntegralOrderServiceImpl implements IFsIntegralOrderService
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public R payConfirm(String orderSn, String payCode, String tradeNo, String payType, int type) {
+    public R payConfirm(String orderSn, String payCode, String tradeNo, String payType, int type,String bankTransactionId,String bankSerialNo){
         log.info("进入积分商城订单支付回调 orderSn: {}, payCode: {}, tradeNo: {}, payType: {}, type: {}",
                 orderSn, payCode, tradeNo, payType, type);
         FsIntegralOrder order = null;
@@ -536,6 +536,8 @@ public class FsIntegralOrderServiceImpl implements IFsIntegralOrderService
                 paymentMap.setStatus(1);
                 paymentMap.setPayTime(new Date());
                 paymentMap.setTradeNo(tradeNo);
+                paymentMap.setBankSerialNo(bankSerialNo);
+                paymentMap.setBankTransactionId(bankTransactionId);
                 if(payType.equals(PayType.WECHAT_MINI_PROGRAM_PAYMENT.getCode())){
                     paymentMap.setPayTypeCode(PayType.WECHAT_MINI_PROGRAM_PAYMENT.name());
                 }

fs-service/src/main/java/com/fs/his/service/impl/FsPackageOrderServiceImpl.java

@@ -643,7 +643,8 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
 
     @Override
     @Transactional
-    public R payConfirm(String orderSn,String payCode, String tradeNo,String payType,Integer type) {
+//    public R payConfirm(String orderSn,String payCode, String tradeNo,String payType,Integer type) {
+    public R payConfirm(String orderSn,String payCode, String tradeNo,String payType,Integer type,String bankTransactionId,String bankSerialNo) {
 //        Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
 //        try {
         logger.info("进入订单");
@@ -657,6 +658,8 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
                     paymentMap.setStatus(1);
                     paymentMap.setPayTime(new Date());
                     paymentMap.setTradeNo(tradeNo);
+                    paymentMap.setBankSerialNo(bankSerialNo);
+                    paymentMap.setBankTransactionId(bankTransactionId);
                     if(payType.equals(PayType.WECHAT_MINI_PROGRAM_PAYMENT.getCode())){
                         paymentMap.setPayTypeCode(PayType.WECHAT_MINI_PROGRAM_PAYMENT.name());
                     }
@@ -1028,7 +1031,7 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
                 }
             }
             else{
-                this.payConfirm(fsPackageOrder.getOrderSn(),"","","",2);
+                this.payConfirm(fsPackageOrder.getOrderSn(),"","","",2,null,null);
                 return R.ok().put("isPay",1);
             }
         }
@@ -1164,7 +1167,7 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
                 }
             }
             else{
-                this.payConfirm(fsPackageOrder.getOrderSn(),"","","",2);
+                this.payConfirm(fsPackageOrder.getOrderSn(),"","","",2,null,null);
                 return R.ok().put("isPay",1);
             }
         }
@@ -1251,7 +1254,7 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
                 }
             }
             else{
-                this.payConfirm(fsPackageOrder.getOrderSn(),"","","",2);
+                this.payConfirm(fsPackageOrder.getOrderSn(),"","","",2,null,null);
                 return R.ok().put("isPay",1);
             }
         }
@@ -1340,7 +1343,7 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
                 }
             }
             else{
-                this.payConfirm(fsPackageOrder.getOrderSn(),"","","",2);
+                this.payConfirm(fsPackageOrder.getOrderSn(),"","","",2,null,null);
                 return R.ok().put("isPay",1);
             }
         }

fs-service/src/main/java/com/fs/his/service/impl/FsStoreOrderServiceImpl.java

@@ -1416,7 +1416,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
 
     @Override
     @Transactional(rollbackFor = Throwable.class, propagation = Propagation.REQUIRED)
-    public R payConfirm(String orderCode, String payCode, String tradeNo, String payType, Integer type) {
+    public R payConfirm(String orderCode, String payCode, String tradeNo, String payType, Integer type,String bankTransactionId,String bankSerialNo){
         try {
             FsStoreOrder order = null;
             if (type.equals(1)) {
@@ -1430,6 +1430,8 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
                         paymentMap.setStatus(1);
                         paymentMap.setPayTime(new Date());
                         paymentMap.setTradeNo(tradeNo);
+                        paymentMap.setBankSerialNo(bankSerialNo);
+                        paymentMap.setBankTransactionId(bankTransactionId);
                         if (payType.equals(PayType.WECHAT_MINI_PROGRAM_PAYMENT.getCode())) {
                             paymentMap.setPayTypeCode(PayType.WECHAT_MINI_PROGRAM_PAYMENT.name());
                         } else if (payType.equals(PayType.ALIPAY_BARCODE_PAYMENT.getCode())) {
@@ -2692,7 +2694,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
         if (user != null && StringUtils.isNotEmpty(openId)) {
 
             if (order.getPayMoney().compareTo(new BigDecimal(0)) == 0) {
-                this.payConfirm(order.getOrderCode(), "", "", "", 2);
+                this.payConfirm(order.getOrderCode(), "", "", "", 2,null,null);
                 return R.ok().put("data", param.getOrderId()).put("isPay", "1");
             } else {
                 String payCode = OrderCodeUtils.getOrderSn();
@@ -2830,7 +2832,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
 
             if (order.getPayMoney().compareTo(new BigDecimal(0)) == 0) {
                 IFsStoreOrderService fsStoreOrderService1 = (IFsStoreOrderService) AopContext.currentProxy();
-                fsStoreOrderService1.payConfirm(order.getOrderCode(), "", "", "", 2);
+                fsStoreOrderService1.payConfirm(order.getOrderCode(), "", "", "", 2,null,null);
                 return R.ok().put("data", param.getOrderId()).put("isPay", "1");
             } else {
                 //在线支付

fs-service/src/main/java/com/fs/his/service/impl/FsStorePaymentServiceImpl.java

@@ -263,15 +263,15 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService {
                 QueryOrderResult body = result.getBody();
                 logger.info("手动回调内容:" + body);
                 if (fsStorePayment.getBusinessType() == 1) {
-                    inquiryOrderService.payConfirm("", fsStorePayment.getPayCode(), fsStorePayment.getTradeNo(), body.getPayType(), 1);
+                    inquiryOrderService.payConfirm("", fsStorePayment.getPayCode(), fsStorePayment.getTradeNo(), body.getPayType(), 1,null,null);
                 } else if (fsStorePayment.getBusinessType() == 2) {
-                    storeOrderService.payConfirm("", fsStorePayment.getPayCode(), fsStorePayment.getTradeNo(), body.getPayType(), 1);
+                    storeOrderService.payConfirm("", fsStorePayment.getPayCode(), fsStorePayment.getTradeNo(), body.getPayType(), 1,null,null);
                 } else if (fsStorePayment.getBusinessType() == 3) {
-                    packageOrderService.payConfirm("", fsStorePayment.getPayCode(), fsStorePayment.getTradeNo(), body.getPayType(), 1);
+                    packageOrderService.payConfirm("", fsStorePayment.getPayCode(), fsStorePayment.getTradeNo(), body.getPayType(), 1,null,null);
                 }else if (fsStorePayment.getBusinessType() == 4) {
-                    courseOrderService.payConfirm("", fsStorePayment.getPayCode(), fsStorePayment.getTradeNo(), "", 1);
+                    courseOrderService.payConfirm("", fsStorePayment.getPayCode(), fsStorePayment.getTradeNo(), "", 1,null,null);
                 }else if (fsStorePayment.getBusinessType() == 5) {
-                    vipOrderService.payConfirm("", fsStorePayment.getPayCode(), fsStorePayment.getTradeNo(), "", 1);
+                    vipOrderService.payConfirm("", fsStorePayment.getPayCode(), fsStorePayment.getTradeNo(), "", 1,null,null);
                 }
             }
         }
@@ -285,15 +285,15 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService {
                     logger.info("手动查询内容:" + paymentId + ":" + orderResult);
                     if (orderResult.getStatus().equals("100")) {
                         if (fsStorePayment.getBusinessType() == 1) {
-                            inquiryOrderService.payConfirm("", fsStorePayment.getPayCode(), fsStorePayment.getTradeNo(), "14", 1);
+                            inquiryOrderService.payConfirm("", fsStorePayment.getPayCode(), fsStorePayment.getTradeNo(), "14", 1,null,null);
                         } else if (fsStorePayment.getBusinessType() == 2) {
-                            storeOrderService.payConfirm("", fsStorePayment.getPayCode(), fsStorePayment.getTradeNo(), "14", 1);
+                            storeOrderService.payConfirm("", fsStorePayment.getPayCode(), fsStorePayment.getTradeNo(), "14", 1,null,null);
                         } else if (fsStorePayment.getBusinessType() == 3) {
-                            packageOrderService.payConfirm("", fsStorePayment.getPayCode(), fsStorePayment.getTradeNo(), "14", 1);
+                            packageOrderService.payConfirm("", fsStorePayment.getPayCode(), fsStorePayment.getTradeNo(), "14", 1,null,null);
                         }else if (fsStorePayment.getBusinessType() == 4) {
-                            courseOrderService.payConfirm("", fsStorePayment.getPayCode(), fsStorePayment.getTradeNo(), "", 1);
+                            courseOrderService.payConfirm("", fsStorePayment.getPayCode(), fsStorePayment.getTradeNo(), "", 1,null,null);
                         }else if (fsStorePayment.getBusinessType() == 5) {
-                            vipOrderService.payConfirm("", fsStorePayment.getPayCode(), fsStorePayment.getTradeNo(), "", 1);
+                            vipOrderService.payConfirm("", fsStorePayment.getPayCode(), fsStorePayment.getTradeNo(), "", 1,null,null);
                         }
                     }
                 }
@@ -314,15 +314,15 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService {
                 if (queryOrderResult.getTrans_stat().equals("S")) {
                     logger.info("手动查询内容:" + paymentId + ":" + request);
                         if (fsStorePayment.getBusinessType() == 1) {
-                            inquiryOrderService.payConfirm("", fsStorePayment.getPayCode(), fsStorePayment.getTradeNo(), "14", 1);
+                            inquiryOrderService.payConfirm("", fsStorePayment.getPayCode(), fsStorePayment.getTradeNo(), "14", 1,queryOrderResult.getOut_trans_id(),queryOrderResult.getParty_order_id());
                         } else if (fsStorePayment.getBusinessType() == 2) {
-                            storeOrderService.payConfirm("", fsStorePayment.getPayCode(), fsStorePayment.getTradeNo(), "14", 1);
+                            storeOrderService.payConfirm("", fsStorePayment.getPayCode(), fsStorePayment.getTradeNo(), "14", 1,queryOrderResult.getOut_trans_id(),queryOrderResult.getParty_order_id());
                         } else if (fsStorePayment.getBusinessType() == 3) {
-                            packageOrderService.payConfirm("", fsStorePayment.getPayCode(), fsStorePayment.getTradeNo(), "14", 1);
+                            packageOrderService.payConfirm("", fsStorePayment.getPayCode(), fsStorePayment.getTradeNo(), "14", 1,queryOrderResult.getOut_trans_id(),queryOrderResult.getParty_order_id());
                         }  else if (fsStorePayment.getBusinessType() == 4) {
-                            courseOrderService.payConfirm("", fsStorePayment.getPayCode(), fsStorePayment.getTradeNo(), "", 1);
+                            courseOrderService.payConfirm("", fsStorePayment.getPayCode(), fsStorePayment.getTradeNo(), "", 1,queryOrderResult.getOut_trans_id(),queryOrderResult.getParty_order_id());
                         }else if (fsStorePayment.getBusinessType() == 5) {
-                            vipOrderService.payConfirm("", fsStorePayment.getPayCode(), fsStorePayment.getTradeNo(), "", 1);
+                            vipOrderService.payConfirm("", fsStorePayment.getPayCode(), fsStorePayment.getTradeNo(), "", 1,queryOrderResult.getOut_trans_id(),queryOrderResult.getParty_order_id());
                         }
 
                 }

fs-service/src/main/java/com/fs/his/vo/FsDoctorArticleUVO.java

@@ -9,6 +9,8 @@ import java.util.Date;
 
 @Data
 public class FsDoctorArticleUVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
 
     /** ID */
     private Long articleId;

fs-user-app/src/main/java/com/fs/app/controller/HuifuPayController.java

@@ -44,25 +44,25 @@ public class HuifuPayController {
             String[] orderId=huiFuResult.getReq_seq_id().split("-");
             switch (orderId[0]){
                 case "inquiry":
-                    inquiryOrderService.payConfirm("",orderId[1],huiFuResult.getHf_seq_id(),"",1);
+                    inquiryOrderService.payConfirm("",orderId[1],huiFuResult.getHf_seq_id(),"",1,huiFuResult.getOut_trans_id(),huiFuResult.getParty_order_id());
                     break;
                 case "store":
-                    storeOrderService.payConfirm("",orderId[1],huiFuResult.getHf_seq_id(),"",1);
+                    storeOrderService.payConfirm("",orderId[1],huiFuResult.getHf_seq_id(),"",1,huiFuResult.getOut_trans_id(),huiFuResult.getParty_order_id());
                     break;
                 case "package":
-                    packageOrderService.payConfirm("",orderId[1],huiFuResult.getHf_seq_id(),"",1);
+                    packageOrderService.payConfirm("",orderId[1],huiFuResult.getHf_seq_id(),"",1,huiFuResult.getOut_trans_id(),huiFuResult.getParty_order_id());
                     break;
                 case "course":
-                    courseOrderService.payConfirm("",orderId[1],huiFuResult.getHf_seq_id(),"",1);
+                    courseOrderService.payConfirm("",orderId[1],huiFuResult.getHf_seq_id(),"",1,huiFuResult.getOut_trans_id(),huiFuResult.getParty_order_id());
                     break;
                 case "appvip":
-                    vipOrderService.payConfirm("",orderId[1],huiFuResult.getHf_seq_id(),"",1);
+                    vipOrderService.payConfirm("",orderId[1],huiFuResult.getHf_seq_id(),"",1,huiFuResult.getOut_trans_id(),huiFuResult.getParty_order_id());
                     break;
                 case "integral":
-                    integralOrderService.payConfirm("",orderId[1],huiFuResult.getHf_seq_id(),"",1);
+                    integralOrderService.payConfirm("",orderId[1],huiFuResult.getHf_seq_id(),"",1,huiFuResult.getOut_trans_id(),huiFuResult.getParty_order_id());
                     break;
                 case "product":
-                    courseProductOrderService.payConfirm("",orderId[1],huiFuResult.getHf_seq_id(),"",1);
+                    courseProductOrderService.payConfirm("",orderId[1],huiFuResult.getHf_seq_id(),"",1,huiFuResult.getOut_trans_id(),huiFuResult.getParty_order_id());
                     break;
             }
         }

fs-user-app/src/main/java/com/fs/app/controller/InquiryOrderController.java

@@ -290,7 +290,7 @@ public class InquiryOrderController extends  AppBaseController {
         }
 
         if(order.getPayMoney().compareTo(new BigDecimal(0))==0){
-            inquiryOrderService.payConfirm(order.getOrderSn(),"","","",2);
+            inquiryOrderService.payConfirm(order.getOrderSn(),"","","",2,null,null);
             return R.ok().put("isPay",1);
         }
         else{
@@ -424,7 +424,7 @@ public class InquiryOrderController extends  AppBaseController {
         FsUser user=userService.selectFsUserByUserId(Long.parseLong(getUserId()));
 
         if(order.getPayMoney().compareTo(new BigDecimal(0))==0){
-            inquiryOrderService.payConfirm(order.getOrderSn(),"","","",2);
+            inquiryOrderService.payConfirm(order.getOrderSn(),"","","",2,null,null);
             return R.ok().put("isPay",1);
         }
         else{

fs-user-app/src/main/java/com/fs/app/controller/TzPayController.java

@@ -57,22 +57,22 @@ public class TzPayController extends BaseController
         logger.info("台州银行支付回调:"+tzBankOrderDecrypt.getOrderFlowNo()+":"+tzBankOrderDecrypt);
         if(tzBankOrderDecrypt.getStatus().equals("90")){
             if(tzBankOrderDecrypt.getOrderNo().indexOf("inquiry")>-1){
-                inquiryOrderService.payConfirm("",tzBankOrderDecrypt.getOrderNo().substring(7),tzBankOrderDecrypt.getOrderFlowNo(),tzBankOrderDecrypt.getPayType(),1);
+                inquiryOrderService.payConfirm("",tzBankOrderDecrypt.getOrderNo().substring(7),tzBankOrderDecrypt.getOrderFlowNo(),tzBankOrderDecrypt.getPayType(),1,null,null);
             }
             else if(tzBankOrderDecrypt.getOrderNo().indexOf("store")>-1){
-                storeOrderService.payConfirm("",tzBankOrderDecrypt.getOrderNo().substring(5),tzBankOrderDecrypt.getOrderFlowNo(),tzBankOrderDecrypt.getPayType(),1);
+                storeOrderService.payConfirm("",tzBankOrderDecrypt.getOrderNo().substring(5),tzBankOrderDecrypt.getOrderFlowNo(),tzBankOrderDecrypt.getPayType(),1,null,null);
             }
             else if(tzBankOrderDecrypt.getOrderNo().indexOf("package")>-1){
-                packageOrderService.payConfirm("",tzBankOrderDecrypt.getOrderNo().substring(7),tzBankOrderDecrypt.getOrderFlowNo(),tzBankOrderDecrypt.getPayType(),1);
+                packageOrderService.payConfirm("",tzBankOrderDecrypt.getOrderNo().substring(7),tzBankOrderDecrypt.getOrderFlowNo(),tzBankOrderDecrypt.getPayType(),1,null,null);
             }
             else if(tzBankOrderDecrypt.getOrderNo().indexOf("course")>-1){
-                courseOrderService.payConfirm("",tzBankOrderDecrypt.getOrderNo().substring(6),tzBankOrderDecrypt.getOrderFlowNo(),tzBankOrderDecrypt.getPayType(),1);
+                courseOrderService.payConfirm("",tzBankOrderDecrypt.getOrderNo().substring(6),tzBankOrderDecrypt.getOrderFlowNo(),tzBankOrderDecrypt.getPayType(),1,null,null);
             }
             else if(tzBankOrderDecrypt.getOrderNo().indexOf("appvip")>-1){
-                userVipOrderService.payConfirm("",tzBankOrderDecrypt.getOrderNo().substring(6),tzBankOrderDecrypt.getOrderFlowNo(),tzBankOrderDecrypt.getPayType(),1);
+                userVipOrderService.payConfirm("",tzBankOrderDecrypt.getOrderNo().substring(6),tzBankOrderDecrypt.getOrderFlowNo(),tzBankOrderDecrypt.getPayType(),1,null,null);
             }
             else if (tzBankOrderDecrypt.getOrderNo().indexOf("integral")>-1) {
-                integralOrderService.payConfirm("",tzBankOrderDecrypt.getOrderNo().substring(8),tzBankOrderDecrypt.getOrderFlowNo(),tzBankOrderDecrypt.getPayType(),1);
+                integralOrderService.payConfirm("",tzBankOrderDecrypt.getOrderNo().substring(8),tzBankOrderDecrypt.getOrderFlowNo(),tzBankOrderDecrypt.getPayType(),1,null,null);
             }
         }
         return decrypt;

fs-user-app/src/main/java/com/fs/app/controller/UserVipController.java

@@ -95,7 +95,7 @@ public class UserVipController extends  AppBaseController{
     public R test(@RequestParam String payCode,@RequestParam String tradeNo)
     {
         System.out.println("payCode:"+payCode);
-        return fsUserVipOrderService.payConfirm("",payCode,tradeNo,"",1);
+        return fsUserVipOrderService.payConfirm("",payCode,tradeNo,"",1,null,null);
     }
 
     @Login

fs-user-app/src/main/java/com/fs/app/controller/WxPayController.java

@@ -110,20 +110,20 @@ public class WxPayController {
                 String[] orderId=outtradeno.split("-");
                 switch (orderId[0]){
                     case "inquiry":
-                        inquiryOrderService.payConfirm("",orderId[1],tradeNo,"",1);
+                        inquiryOrderService.payConfirm("",orderId[1],tradeNo,"",1,tradeNo,null);
                     case "store":
-                        storeOrderService.payConfirm("",orderId[1],tradeNo,"",1);
+                        storeOrderService.payConfirm("",orderId[1],tradeNo,"",1,tradeNo,null);
                     case "package":
-                        packageOrderService.payConfirm("",orderId[1],tradeNo,"",1);
+                        packageOrderService.payConfirm("",orderId[1],tradeNo,"",1,tradeNo,null);
                     case "course":
-                        courseOrderService.payConfirm("",orderId[1],tradeNo,"",1);
+                        courseOrderService.payConfirm("",orderId[1],tradeNo,"",1,tradeNo,null);
                     case "appvip":
-                        userVipOrderService.payConfirm("",orderId[1],tradeNo,"",1);
+                        userVipOrderService.payConfirm("",orderId[1],tradeNo,"",1,tradeNo,null);
                     case "integral":
-                        integralOrderService.payConfirm("",orderId[1],tradeNo,"",1);
+                        integralOrderService.payConfirm("",orderId[1],tradeNo,"",1,tradeNo,null);
                         break;
                     case "product":
-                        courseProductOrderService.payConfirm("",orderId[1],tradeNo,"",1);
+                        courseProductOrderService.payConfirm("",orderId[1],tradeNo,"",1,tradeNo,null);
                 }
                 return WxPayNotifyResponse.success("处理成功!");
             }else{

fs-user-app/src/main/java/com/fs/app/controller/YbPayController.java

@@ -62,22 +62,22 @@ public class YbPayController extends BaseController
         String[] orderId=o.getLowOrderId().split("-");
         switch (orderId[0]){
             case "inquiry":
-                inquiryOrderService.payConfirm("",orderId[1],o.getUpOrderId(),"",1);
+                inquiryOrderService.payConfirm("",orderId[1],o.getUpOrderId(),"",1,null,null);
                 break;
             case "store":
-                storeOrderService.payConfirm("",orderId[1],o.getUpOrderId(),"",1);
+                storeOrderService.payConfirm("",orderId[1],o.getUpOrderId(),"",1,null,null);
                 break;
             case "package":
-                packageOrderService.payConfirm("",orderId[1],o.getUpOrderId(),"",1);
+                packageOrderService.payConfirm("",orderId[1],o.getUpOrderId(),"",1,null,null);
                 break;
             case "course":
-                courseOrderService.payConfirm("",orderId[1],o.getUpOrderId(),"",1);
+                courseOrderService.payConfirm("",orderId[1],o.getUpOrderId(),"",1,null,null);
                 break;
             case "appvip":
-                userVipOrderService.payConfirm("",orderId[1],o.getUpOrderId(),"",1);
+                userVipOrderService.payConfirm("",orderId[1],o.getUpOrderId(),"",1,null,null);
                 break;
             case "integral":
-                integralOrderService.payConfirm("",orderId[1],o.getUpOrderId(),"",1);
+                integralOrderService.payConfirm("",orderId[1],o.getUpOrderId(),"",1,null,null);
                 break;
         }
         System.out.println(o);