Merge branch 'master' of http://115.29.66.169:10080/yiyao_shop/api

ruoyi-api/src/main/java/com/ruoyi/api/controller/shop/ApiShopOrderController.java

@@ -215,7 +215,7 @@ public class ApiShopOrderController extends AbstractApiController {
         Integer money = Integer.valueOf(order.getActualPayment().multiply(new BigDecimal(100)).setScale(0, BigDecimal.ROUND_DOWN).toString());
         FubeiPayWay payWay = FubeiPayWay.W_WX_LITE;
         UserThirdType userThirdType = UserThirdType.WX_CASHIER_MINI_PROGRAM;
-        if (PaymentMethod.ALIPAY.equals(dto.getPayType())) {
+        if (PaymentMethod.ALIPAY.equals(order.getPaymentMethod())) {
             payWay = FubeiPayWay.W_ALI_LITE;
             userThirdType = UserThirdType.ALI_MINI_PROGRAM;
         }

ruoyi-shop/src/main/java/com/ruoyi/shop/order/domain/bo/ShopOrderPayDto.java

@@ -28,11 +28,4 @@ public class ShopOrderPayDto implements Serializable {
     @NotNull(message = "订单编号不能为空", groups = { AddGroup.class })
     private String orderNo;
 
-    /**
-     * 支付方式
-     */
-    @ApiModelProperty(value = "支付方式", required = true)
-    @NotNull(message = "支付方式不能为空", groups = { AddGroup.class })
-    private PaymentMethod payType;
-
 }