From cc290cd8026dbc96a571e9e63c8de75a0ebf71a0 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 16 Mar 2021 18:35:33 +0800
Subject: [PATCH] 新增配置查询4
---
zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java | 2 +-
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java
index d9b69d5..9cf5e16 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java
@@ -163,7 +163,7 @@
case FenxiaoSettingConstant.FX_APPLY_CONDITION_XCZDJE:
Double zdje=Double.parseDouble(applyCondition.getParamValue2());
Double yxfje=shopOrderV2Dao.countOrderAmount(openId);
- if(zdje>yxfje){
+ if(zdje<yxfje){
verificationResult=VerificationResult.buildVerificationResult(true);
}else{
verificationResult= VerificationResult.buildVerificationResult(false,"不符合申请条件，请消费满"+zdje+"元后再申请！");
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java
index 74cf382..ed74a5d 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java
@@ -102,7 +102,7 @@
String invitationId = param.get("invitationId");
if(StringUtils.isNotBlank(invitationId)){
BizUser invitationUser = bizUserDao.findByOpenId(invitationId);
- if(invitationUser.getOpenId().equals(loginUser.getOpenId())) {
+ if(invitationUser!=null && invitationUser.getOpenId().equals(loginUser.getOpenId())) {
return AjaxResult.buildFailInstance("不能邀请自己成为推广员");
}
}
--
Gitblit v1.9.1