zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java
@@ -142,10 +142,9 @@ BusParameterSettings applyCondition = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_APPLY_CONDITION, companyId); switch (applyCondition.getParamValue()){ case FenxiaoSettingConstant.FX_APPLY_CONDITION_WTJ: VerificationResult.buildVerificationResult(true); verificationResult= VerificationResult.buildVerificationResult(true); break; case FenxiaoSettingConstant.FX_APPLY_CONDITION_XFZDCP: VerificationResult.buildVerificationResult(true); int buyZdcpCount= shopOrderV2Dao.countBuyZdcp(openId,applyCondition.getParamValue1()); if(buyZdcpCount>0){ verificationResult= VerificationResult.buildVerificationResult(true); @@ -170,10 +169,9 @@ }else{ verificationResult= VerificationResult.buildVerificationResult(false,"不符合申请条件,请消费满"+zdje+"元后再申请!"); } VerificationResult.buildVerificationResult(true); break; default: VerificationResult.buildVerificationResult(true); verificationResult= VerificationResult.buildVerificationResult(true); } return verificationResult; zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java
@@ -301,4 +301,6 @@ } zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java
@@ -23,10 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.*; import java.util.Collections; import java.util.Date; @@ -144,6 +141,20 @@ return res; } /** * 根据OpenID查询用户信息 */ @GetMapping(value = "/findUserInfo/{openId}") public @ResponseBody AjaxResult findUserInfo(@PathVariable String openId) { BizUser bizUser = bizUserService.findByOpenId(openId); BizUser bizUserQuery=new BizUser(); bizUserQuery.setNickName(bizUser.getNickName()); bizUserQuery.setAvatarUrl(bizUser.getAvatarUrl()); bizUserQuery.setOpenId(openId); return AjaxResult.buildSuccessInstance(bizUserQuery); } /** * 接收用户信息