feat:合并代码

alien-dining/src/main/java/shop/alien/dining/strategy/payment/impl/WeChatPartnerPaymentMininProgramStrategyImpl.java

@@ -14,6 +14,7 @@ import okhttp3.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
+import shop.alien.dining.constants.OrderMenuConstants;
 import shop.alien.dining.service.StoreOrderService;
 import shop.alien.dining.strategy.payment.PaymentStrategy;
 import shop.alien.dining.util.WXPayUtility;
@@ -51,7 +52,6 @@ import java.util.concurrent.CompletableFuture;
  * 子商户小程序 {@code sub_appid} 优先取门店 {@link StorePaymentConfig}，否则取配置项 {@code payment.wechatPartnerPay.business.subAppId}。
  * </p>
  *
- * @see shop.alien.store.strategy.payment.impl.WeChatPartnerPaymentStrategyImpl
  * @see WeChatPaymentMininProgramStrategyImpl
  */
 @Slf4j
@@ -447,7 +447,7 @@ public class WeChatPartnerPaymentMininProgramStrategyImpl implements PaymentStra
                         }
                     }
                     try {
-                        storeOrderService.resetTableAfterPayment(storeOrder.getTableId(),);
+                        storeOrderService.resetTableAfterPayment(storeOrder.getTableId(), OrderMenuConstants.MENU_TYPE_CUISINE);
                         log.info("[WeChatPartnerMinin] 支付后重置餐桌 tableId={}", storeOrder.getTableId());
                     } catch (Exception e) {
                         log.error("[WeChatPartnerMinin] 重置餐桌失败 tableId={}", storeOrder.getTableId(), e);

alien-store/src/main/java/shop/alien/store/feign/DiningServiceFeign.java

@@ -674,27 +674,6 @@ public interface DiningServiceFeign {
     @PostMapping(value = "/dining/file/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     R<String> uploadFile(@RequestPart("file") MultipartFile file);
 
-    @GetMapping("/payment/prePay")
-    R<Object> prePay(
-            @RequestHeader(value = "Authorization", required = false) String authorization,
-            @RequestParam("price") String price,
-            @RequestParam("subject") String subject,
-            @RequestParam("payType") String payType,
-            @RequestParam("payer") String payer,
-            @RequestParam("orderNo") String orderNo,
-            @RequestParam("storeId") Integer storeId,
-            @RequestParam(value = "couponId", required = false) Integer couponId,
-            @RequestParam(value = "payerId", required = false) Integer payerId,
-            @RequestParam(value = "tablewareFee", required = false) String tablewareFee,
-            @RequestParam(value = "discountAmount", required = false) String discountAmount,
-            @RequestParam(value = "payAmount", required = false) String payAmount);
-
-    @GetMapping("/payment/searchOrderByOutTradeNoPath")
-    R<Object> searchOrderByOutTradeNoPath(
-            @RequestParam("transactionId") String transactionId,
-            @RequestParam("payType") String payType,
-            @RequestParam("storeId") Integer storeId);
-
     /**
      * 支付成功后重置餐桌与购物车（与 alien-dining {@code StoreOrderService.resetTableAfterPayment} 一致），供微信回调等业务使用。
      */