添加节点类型、标签等

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

@@ -17,6 +17,7 @@ import com.xm.core.service.XmGroupService;
 import com.xm.core.service.XmGroupUserService;
 import com.xm.core.service.XmTaskExecuserService;
 import com.xm.core.service.XmTaskService;
+import com.xm.core.service.client.MkClient;
 import com.xm.core.vo.XmGroupVo;
 import io.swagger.annotations.*;
 import org.apache.commons.logging.Log;
@@ -62,6 +63,9 @@ public class XmTaskExecuserController {
 
 	@Autowired
 	ItemService itemService;
+
+	@Autowired
+	MkClient mkClient;
 	
 
 	@Autowired
@@ -165,6 +169,13 @@ public class XmTaskExecuserController {
 				return m;
 			}
 
+			if("1".equals(xmTask.getCrowd())){
+				tips=mkClient.checkMemberInterests(xmTaskExecuser.getUserid(),xmTask.getBudgetAt(),xmTask.getBudgetWorkload(),1);
+				if(!tips.isOk()){
+					return ResponseHelper.failed(tips);
+				}
+			}
+
 			if(!"0".equals(xmTask.getTaskState()) && !"1".equals(xmTask.getTaskState()) ){
 				tips.setFailureMsg("该任务已经处于完工、结算状态，不允许再修改");
 				m.put("tips", tips);

xm-core/src/main/java/com/xm/core/service/XmTaskSbillService.java

@@ -121,7 +121,7 @@ public class XmTaskSbillService extends BaseService {
 			BigDecimal actNum=BigDecimal.valueOf(1);
 			BigDecimal sigPrice= NumberUtil.getBigDecimal(t.get("samt"));
 			BigDecimal workload=NumberUtil.getBigDecimal(t.get("sworkload"));
-			mkClient.pushActiExecOrder(taskId,userid,username,custBranchId,taskId, actNum,sigPrice,actNum.multiply(sigPrice),workload,taskName);
+			mkClient.pushActiExecOrder(taskId,userid,username,custBranchId,xmTaskSbill.getBranchId(),taskId, actNum,sigPrice,actNum.multiply(sigPrice),workload,taskName);
 		}
 	}
 

xm-core/src/main/java/com/xm/core/service/client/MkClient.java

@@ -13,6 +13,8 @@ import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.Map;
 
+import static com.mdp.core.utils.BaseUtils.map;
+
 @Service
 /**
  * 对mk接口调用
@@ -22,6 +24,9 @@ public class MkClient {
     @Autowired
     StringRedisTemplate strRedisTemplate;
 
+    @Autowired
+    CallBizService callBizService;
+
     @Autowired
     Push push;
 
@@ -35,7 +40,7 @@ public class MkClient {
      * 		execOrder.setCustBranchId("platform-branch-001");
      * @return
      */
-    public Tips pushActiExecOrder(String orderId,String custId,String custName,String custBranchId, String entityId,BigDecimal actNum,BigDecimal actSinglePrice,BigDecimal totalPrice,BigDecimal workload,String entityDesc){
+    public Tips pushActiExecOrder(String orderId,String custId,String custName,String custBranchId,String orderBranchId, String entityId,BigDecimal actNum,BigDecimal actSinglePrice,BigDecimal totalPrice,BigDecimal workload,String entityDesc){
         Tips tips = new Tips("推送订单成功");
         Map<String,Object> params=new HashMap<>();
         params.put("orderId",orderId);
@@ -43,7 +48,7 @@ public class MkClient {
         params.put("custId",custId);
         params.put("custName",custName);
         params.put("custBranchId",custBranchId);
-        params.put("orderBranchId",custBranchId);
+        params.put("orderBranchId",orderBranchId);
         params.put("entityId",entityId);
         params.put("actNum",actNum);
         params.put("actSinglePrice",actSinglePrice);
@@ -54,4 +59,17 @@ public class MkClient {
        // strRedisTemplate.convertAndSend("xm_task_settle", JSON.toJSONString(params));
         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";
+        return callBizService.postForTips(url,map("userid",userid  ,"at",at,"exp",exp,"bids",bids));
+    }
 }