jk-GitHub-coder 4 anos atrás
pai
commit
b7d855adc0

+ 1 - 1
YijiaRestful/src/main/java/com/platform/yijia/controller/PayOrderController.java

@@ -237,7 +237,7 @@ public class PayOrderController {
         customerLabel.setStationId(payOrderRequest.getStationId());
         //获取该用户是否在标签组内
         CustomerLabel customerLabelInfo = labelService.getCustomerLabel(customerLabel);
-        if(payOrderRequest.getLabelFlag().equals("1") && customerLabelInfo !=null){
+        if(payOrderRequest.getLabelFlag() !=null && payOrderRequest.getLabelFlag().equals("1") && customerLabelInfo !=null){
             //表示此用户为标签用户,计算标签用户优惠
             payOrderResultInfo = this.calculateLabelDiscount(params);
         }else {

+ 1 - 1
YijiaRestful/src/main/resources/application.yml

@@ -19,7 +19,7 @@ yijia:
     domainName: mp.huijy.net
     # 路径前缀 test:测试; api:生产一线;prod:生产二线; demo:演示;
     path:
-        global-prefix: demo
+        global-prefix: test
 
 
 # POS机登录解密密文密码