11

admin-ui/.env.development

@@ -7,8 +7,8 @@ ENV = 'development'
 
 VUE_APP_BASE_API_HOST = 'http://127.0.0.1:9801'
 VUE_APP_BASE_API = 'http://127.0.0.1:9801'
-# VUE_APP_BASE_API_HOST = 'http://139.224.65.227:8091/prod-api'
-# VUE_APP_BASE_API = 'http://139.224.65.227:8091/prod-api'
+#VUE_APP_BASE_API_HOST = 'http://139.224.65.227:8091/prod-api'
+#VUE_APP_BASE_API = 'http://139.224.65.227:8091/prod-api'
 # VUE_APP_BASE_API_HOST = 'http://192.168.5.247:9801/'
 # VUE_APP_BASE_API = 'http://192.168.5.247:9801/'
 

yiqi-common/src/main/java/com/yiqi/order/domain/dto/weapp/AppGoodsMarketOrderDTO.java

@@ -28,7 +28,6 @@ public class AppGoodsMarketOrderDTO {
     private Boolean isDeduct;
 
     @ApiModelProperty("客户地址id")
-    @NotNull(message = "客户地址不能为空")
     private Long appUserAddressId;
 
     @ApiModelProperty("支付方式（3=余额）")

yiqi-common/src/main/java/com/yiqi/order/domain/dto/weapp/AppGoodsOrderDTO.java

@@ -34,8 +34,6 @@ public class AppGoodsOrderDTO {
     private String platform;
 
     @ApiModelProperty("客户地址id")
-
-    @NotNull(message = "客户地址不能为空")
     private Long appUserAddressId;
 
     @ApiModelProperty("支付方式（3=余额）")

yiqi-core/src/main/java/com/yiqi/order/service/impl/OrderGoodsServiceImpl.java

@@ -538,6 +538,7 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
         orderGoods.setCashPayAmount(BigDecimal.ZERO);
         orderGoods.setWxPayAmount(BigDecimal.ZERO);
         orderGoods.setAliPayAmount(BigDecimal.ZERO);
+        orderGoods.setPayType(orderGoodsPayDTO.getPayType());
         OrderPayResultVO orderPayResultVO = new OrderPayResultVO();
         if (orderGoods.getPayType().equals(PayType.CASH.getCode()) && OrderSourceType.OFFLINE.getCode().equals(orderGoods.getOrderSource())) {
             orderGoods.setPayType(PayType.CASH.getCode());

yiqi-core/src/main/java/com/yiqi/payment/WechatPayService.java

@@ -70,10 +70,6 @@ public class WechatPayService {
     @PostConstruct
     public void init() {
         notify_url = sysConfigRecordService.getCacheConfigRecordByKey("pay_weixin_notify");
-        if(ruoYiConfig.getEnv().equals("dev")){
-            pay_cert = "";
-            notify_url = "";
-        }
         initConfig();
     }