变更为执行人关于托福赏金的判断,支持追加赏金操作

xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java

@@ -207,12 +207,8 @@ public class XmTaskExecuserController {
 				}
 			}
 			if("1".equals(xmTask.getCrowd())){
-				Map<String,Object> 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<String,Object>  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();

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<String,Object> 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<String,Object> re=callBizService.getForMap(url,map("userid",userid  ,"at",at,"exp",exp,"bids",bids));
-        return re;
-    }
-    /**
-     * 检查用户是否可以投标-针对私人用户
-     * @param userid
-     * @return Map
-     */
-    public Map<String, Object> getMemberDetailByUserid(String userid){
-        String url="/mk/mk/mem/member/detailByUserid?userid={userid}";
-        Map<String,Object> result= callBizService.getForMap(url,map("userid",userid));
-        return (Map<String, Object>) 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;
-    }
 }

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<String,Object> checkAndGetBranchInterests(String branchId,BigDecimal at,BigDecimal exp,Integer bids){
+    public Map<String,Object> checkBranchInterests(String branchId,BigDecimal at,BigDecimal exp,Integer bids){
         String url="/sys/sys/branchInterests/checkBranchInterests?branchId={branchId}&at={at}&exp={exp}&bids={bids}";
         Map<String,Object> 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<String,Object> checkUserInterests(String userid,BigDecimal at,BigDecimal exp,Integer bids){
+        String url="/sys/sys/userInterests/checkUserInterests?userid={userid}&at={at}&exp={exp}&bids={bids}";
+        Map<String,Object> 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;
     }