parent: 29ec1723 | patch | commit | ignore whitespace
jyy
2021-03-16 cc290cd8026dbc96a571e9e63c8de75a0ebf71a0 
新增配置查询4
2 files modified
4 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java 2 ●●●●● patch | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java 2 ●●●●● patch | view | raw | blame | history 
 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+"元后再申请！");




 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("不能邀请自己成为推广员");


            }


        }