From 277e72fa96e2d2ba1311b5e33bdddc40e11ce161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Mon, 2 Jan 2023 14:15:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E4=B8=BA=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E4=BA=BA=E5=85=B3=E4=BA=8E=E6=89=98=E7=A6=8F=E8=B5=8F=E9=87=91?= =?UTF-8?q?=E7=9A=84=E5=88=A4=E6=96=AD,=E6=94=AF=E6=8C=81=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0=E8=B5=8F=E9=87=91=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/ctrl/XmTaskExecuserController.java | 15 ++---- .../com/xm/core/service/client/MkClient.java | 51 ------------------- .../com/xm/core/service/client/SysClient.java | 21 ++++++-- 3 files changed, 22 insertions(+), 65 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java index 6c76fe85..799093aa 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java @@ -207,12 +207,8 @@ public class XmTaskExecuserController { } } if("1".equals(xmTask.getCrowd())){ - Map result=null; - if(!isBranch){ - result=mkClient.checkAndGetMemberInterests(xmTaskExecuser.getUserid(),xmTask.getBudgetAt(),xmTask.getBudgetWorkload(),1); - }else{ - result= sysClient.checkAndGetBranchInterests(xmTaskExecuser.getExecUserBranchId(),xmTask.getBudgetAt(),xmTask.getBudgetWorkload(),1); - } + Map result=sysClient.checkUserInterests(xmTaskExecuser.getUserid(),xmTask.getBudgetAt(),xmTask.getBudgetWorkload(),1); + Tips tips2= (Tips) result.get("tips"); if(!tips2.isOk()){ return ResponseHelper.failed(tips2); @@ -251,11 +247,8 @@ public class XmTaskExecuserController { if(sendMsg){ notifyMsgService.pushMsg(user, xmTask.getCreateUserid(), xmTask.getCreateUsername(), "2", xmTaskExecuser.getProjectId(), xmTaskExecuser.getTaskId(), "用户【"+xmTaskExecuser.getUsername()+"】投标任务【"+xmTask.getName()+"】，请及时跟进！"); } - if(isBranch){ - sysClient.pushBidsAfterBidSuccess(xmTaskExecuser.getExecUserBranchId(),xmTask.getBudgetAt(),xmTask.getBudgetWorkload(),1); - }else { - mkClient.pushBidsAfterBidSuccess(xmTaskExecuser.getUserid(),xmTask.getBudgetAt(),xmTask.getBudgetWorkload(),1); - } + sysClient.pushBidsAfterBidSuccess(xmTaskExecuser.getUserid(),xmTask.getBudgetAt(),xmTask.getBudgetWorkload(),1); + m.put("data",xmTaskExecuser); }catch (BizException e) { tips=e.getTips(); diff --git a/xm-core/src/main/java/com/xm/core/service/client/MkClient.java b/xm-core/src/main/java/com/xm/core/service/client/MkClient.java index 8c7c0b3f..d6cabc5f 100644 --- a/xm-core/src/main/java/com/xm/core/service/client/MkClient.java +++ b/xm-core/src/main/java/com/xm/core/service/client/MkClient.java @@ -9,11 +9,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; -import java.math.BigDecimal; -import java.util.Map; - -import static com.mdp.core.utils.BaseUtils.map; - @Service /** * 对mk接口调用 @@ -35,50 +30,4 @@ public class MkClient { return tips; } - /** - * 检查用户是否可以投标-针对私人用户 - * @param userid - * @param at - * @param exp - * @param bids - * @return {tipscode:bids-not-enough,msg:投标次数超限},{tipscode:smaxExp-not-enough,msg:投标工作量超限},{tipscode:smaxAt-not-enough,msg:投标金额超限}, - */ - public Tips checkMemberInterests(String userid,BigDecimal at,BigDecimal exp,Integer bids){ - String url="/mk/mk/mem/memberInterests/checkMemberInterests?userid={userid}&at={at}&exp={exp}&bids={bids}"; - return callBizService.getForTips(url,map("userid",userid ,"at",at,"exp",exp,"bids",bids)); - } - /** - * 检查用户是否可以投标-针对私人用户 - * @param userid - * @param at - * @param exp - * @param bids - * @return {tipscode:bids-not-enough,msg:投标次数超限},{tipscode:smaxExp-not-enough,msg:投标工作量超限},{tipscode:smaxAt-not-enough,msg:投标金额超限}, - */ - public Map checkAndGetMemberInterests(String userid,BigDecimal at,BigDecimal exp,Integer bids){ - String url="/mk/mk/mem/memberInterests/checkMemberInterests?userid={userid}&at={at}&exp={exp}&bids={bids}"; - Map re=callBizService.getForMap(url,map("userid",userid ,"at",at,"exp",exp,"bids",bids)); - return re; - } - /** - * 检查用户是否可以投标-针对私人用户 - * @param userid - * @return Map - */ - public Map getMemberDetailByUserid(String userid){ - String url="/mk/mk/mem/member/detailByUserid?userid={userid}"; - Map result= callBizService.getForMap(url,map("userid",userid)); - return (Map) result.get("data"); - } - - /** - * 投标成功后登记投标次数-针对私人用户 - * @return - */ - public Tips pushBidsAfterBidSuccess(String userid,BigDecimal at,BigDecimal exp,Integer bids){ - Tips tips = new Tips("推送订单成功"); - push.leftPush("xm_task_bid",map("userid",userid ,"at",at,"exp",exp,"bids",bids)); - // strRedisTemplate.convertAndSend("xm_task_settle", JSON.toJSONString(params)); - return tips; - } } diff --git a/xm-core/src/main/java/com/xm/core/service/client/SysClient.java b/xm-core/src/main/java/com/xm/core/service/client/SysClient.java index 66dbeace..178fc36c 100644 --- a/xm-core/src/main/java/com/xm/core/service/client/SysClient.java +++ b/xm-core/src/main/java/com/xm/core/service/client/SysClient.java @@ -68,19 +68,34 @@ public class SysClient { * @param bids * @return {tipscode:bids-not-enough,msg:投标次数超限},{tipscode:smaxExp-not-enough,msg:投标工作量超限},{tipscode:smaxAt-not-enough,msg:投标金额超限}, */ - public Map checkAndGetBranchInterests(String branchId,BigDecimal at,BigDecimal exp,Integer bids){ + public Map checkBranchInterests(String branchId,BigDecimal at,BigDecimal exp,Integer bids){ String url="/sys/sys/branchInterests/checkBranchInterests?branchId={branchId}&at={at}&exp={exp}&bids={bids}"; Map re=callBizService.getForMap(url,map("branchId",branchId ,"at",at,"exp",exp,"bids",bids)); return re; } + + /** + * 检查用户归属企业是否可以投标等等 + * @param userid + * @param at + * @param exp + * @param bids + * @return {tipscode:bids-not-enough,msg:投标次数超限},{tipscode:smaxExp-not-enough,msg:投标工作量超限},{tipscode:smaxAt-not-enough,msg:投标金额超限}, + */ + public Map checkUserInterests(String userid,BigDecimal at,BigDecimal exp,Integer bids){ + String url="/sys/sys/userInterests/checkUserInterests?userid={userid}&at={at}&exp={exp}&bids={bids}"; + Map re=callBizService.getForMap(url,map("userid",userid ,"at",at,"exp",exp,"bids",bids)); + return re; + } + /** * 投标成功后登记投标次数-登记企业的投标次数 * @return */ - public Tips pushBidsAfterBidSuccess(String branchId,BigDecimal at,BigDecimal exp,Integer bids){ + public Tips pushBidsAfterBidSuccess(String userid,BigDecimal at,BigDecimal exp,Integer bids){ Tips tips = new Tips("推送订单成功"); - push.leftPush("xm_task_bid_for_branch",map("branchId",branchId ,"at",at,"exp",exp,"bids",bids)); + push.leftPush("xm_task_bid_for_person",map("userid",userid ,"at",at,"exp",exp,"bids",bids)); // strRedisTemplate.convertAndSend("xm_task_settle", JSON.toJSONString(params)); return tips; }