alien-entity/src/main/java/shop/alien/entity/store/AlipayZftCreateRecord.java

@@ -85,4 +85,5 @@ public class AlipayZftCreateRecord {
     @ApiModelProperty(value = "更新人ID")
     @TableField(value = "updated_user_id", fill = FieldFill.INSERT_UPDATE)
     private Integer updatedUserId;
+
 }

alien-entity/src/main/java/shop/alien/mapper/AlipayZftCreateRecordMapper.java

@@ -9,4 +9,5 @@ import shop.alien.entity.store.AlipayZftCreateRecord;
  */
 @Mapper
 public interface AlipayZftCreateRecordMapper extends BaseMapper<AlipayZftCreateRecord> {
+
 }

alien-store/src/main/java/shop/alien/store/controller/PaymentController.java

@@ -72,18 +72,18 @@ public class PaymentController {
             @RequestParam(required = false) String payAmount) {
         log.info("PaymentController:prePay, price: {}, subject: {}, payType: {}, orderNo: {}, storeId: {}", price, subject, payType, orderNo, storeId);
         try {
-            if ("wechatPayMininProgram".equals(payType) && storeId != null && orderNo != null && payer != null) {
-                return diningServiceFeign.prePay(
-                        authHeader(request), price, subject, payType, payer, orderNo, storeId,
-                        couponId, payerId, tablewareFee, discountAmount, payAmount);
-            }
+//            if ("wechatPayMininProgram".equals(payType) && storeId != null && orderNo != null && payer != null) {
+//                return diningServiceFeign.prePay(
+//                        authHeader(request), price, subject, payType, payer, orderNo, storeId,
+//                        couponId, payerId, tablewareFee, discountAmount, payAmount);
+//            }
             // 微信服务商 APP：传入 orderNo 时与小程序策略一致，绑定/刷新 store_order 与微信商户单号
             if ("wechatPayPartner".equals(payType) && storeId != null && orderNo != null) {
                 return paymentStrategyFactory.getStrategy(payType).createPrePayOrder(
                         price, subject, payer, orderNo, storeId, couponId, payerId,
                         tablewareFee, discountAmount, payAmount);
             }
-            if ("aliPayPartner".equals(payType) && storeId != null && orderNo != null && payer != null) {
+            if ("aliPayPartner".equals(payType)) {
                 return paymentStrategyFactory.getStrategy(payType).createPreAliPayOrder(orderNo, price, subject, smid, storeId);
             }
             return paymentStrategyFactory.getStrategy(payType).createPrePayOrder(price, subject, storeId);
@@ -143,9 +143,9 @@ public class PaymentController {
             @RequestParam String payType,
             @RequestParam(required = false) Integer storeId) {
         try {
-            if ("wechatPayMininProgram".equals(payType) && storeId != null) {
-                return diningServiceFeign.searchOrderByOutTradeNoPath(transactionId, payType, storeId);
-            }
+//            if ("wechatPayMininProgram".equals(payType) && storeId != null) {
+//                return diningServiceFeign.searchOrderByOutTradeNoPath(transactionId, payType, storeId);
+//            }
             return paymentStrategyFactory.getStrategy(payType).searchOrderByOutTradeNoPath(transactionId, storeId);
         } catch (Exception e) {
             return R.fail(e.getMessage());

alien-store/src/main/java/shop/alien/store/service/impl/AlipayZftOnboardingServiceImpl.java

@@ -272,6 +272,7 @@ public class AlipayZftOnboardingServiceImpl implements AlipayZftOnboardingServic
         if (response != null) {
             record.setSubCode(response.getSubCode());
             record.setSubMsg(response.getSubMsg());
+            record.setOrderId(request1 != null ? response.getOrderId() : null);
         }
         alipayZftCreateRecordMapper.insert(record);