diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskBidOrderController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskBidOrderController.java index ad43836a..882f0b72 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskBidOrderController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskBidOrderController.java @@ -17,6 +17,7 @@ import com.xm.core.entity.XmTask; import com.xm.core.entity.XmTaskBidOrder; import com.xm.core.service.XmTaskBidOrderService; import com.xm.core.service.XmTaskService; +import com.xm.core.service.client.SysClient; import com.xm.core.vo.AddXmTaskBidOrderVo; import io.swagger.annotations.*; import org.slf4j.Logger; @@ -63,6 +64,9 @@ public class XmTaskBidOrderController { @Autowired RedisTemplate redisTemplate; + + @Autowired + SysClient sysClient; Map fieldsMap = toMap(new XmTaskBidOrder()); @@ -133,10 +137,21 @@ public class XmTaskBidOrderController { return ResponseHelper.failed("bidStep-no-2","当前任务不是投标阶段,无须购买投标直通车"); } User user= LoginUtils.getCurrentUserInfo(); + User userInterests=sysClient.getUserInterestsByUserid(user.getUserid()); + bidOrderVo.setExecUserBranchId(user.getBranchId()); bidOrderVo.setUsername(user.getUsername()); bidOrderVo.setBranchId(xmTaskDb.getCbranchId()); bidOrderVo.setProjectId(xmTaskDb.getProjectId()); + bidOrderVo.setBidDirect("1"); + bidOrderVo.setCmonthBids(NumberUtil.getInteger(userInterests.get("cmonthBids"),0)); + bidOrderVo.setCmonthExp(NumberUtil.getBigDecimal(userInterests.get("cmonthExp"),BigDecimal.ZERO)); + bidOrderVo.setSrvTimes(NumberUtil.getInteger(userInterests.get("srvTimes"),0)); + bidOrderVo.setIlvlId(userInterests.getIlvlId()); + bidOrderVo.setGradeId(userInterests.getGradeId()); + bidOrderVo.setGuardId(userInterests.getGuardId()); + bidOrderVo.setCreditId(userInterests.getCreditId()); + XmTaskBidOrder order=new XmTaskBidOrder(); order.setId(this.xmTaskBidOrderService.createKey("id")); order.setTaskId(xmTaskDb.getId()); diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskBidOrderService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskBidOrderService.java index 7bd5c9f0..3f214ec4 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskBidOrderService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskBidOrderService.java @@ -10,7 +10,6 @@ import com.xm.core.service.client.AcClient; import com.xm.core.vo.AddXmTaskBidOrderVo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; @@ -21,8 +20,6 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
@@ -89,22 +86,8 @@ public class XmTaskBidOrderService extends BaseService { AddXmTaskBidOrderVo bidOrderVo=JSON.parseObject(json,AddXmTaskBidOrderVo.class); execuserService.addExecuser(bidOrderVo,true); - BeanUtils.copyProperties(order,xmTaskUpdate); - xmTaskUpdate.setId(taskOrderDb.getTaskId()); - //托管资金后用户开始工作 - if("1".equals(taskOrderDb.getBizType()) && "2".equals(xmTaskUpdate.getEstate()) && "1".equals(taskOrderDb.getEstate())){ - xmTaskUpdate.setBidStep("5"); - xmTaskUpdate.setEfunds(payAt); - } this.updateSomeFieldByPk(order); - if("1".equals(taskOrderDb.getBizType()) && "5".equals(xmTaskUpdate.getBidStep())){ - XmTask xmTaskDb=this.xmTaskService.selectOneById(taskOrderDb.getTaskId()); - msgService.pushMsg(taskOrderDb.getObranchId(),taskOrderDb.getOuserid(),xmTaskDb.getExecutorUserid(),"2",xmTaskDb.getProjectId(),xmTaskDb.getId(),"雇主成功托管佣金【"+taskOrderDb.getEfunds()+"】,实际到账金额【"+payAt+"】,当前任务进入用户工作阶段,请尽快开展工作。"); - xmRecordService.addXmTaskRecord(taskOrderDb.getProjectId(),taskOrderDb.getTaskId(),"托管佣金","成功托管佣金【"+taskOrderDb.getEfunds()+"】,实际到账金额【"+payAt+"】"); - }else{ - xmRecordService.addXmTaskRecord(taskOrderDb.getProjectId(),taskOrderDb.getTaskId(),"营销活动","成功缴纳活动费用金额【"+taskOrderDb.getFinalFee()+"】,实际到账金额【"+payAt+"】。参加的活动为【"+marketNames.stream().collect(Collectors.joining(","))+"】"); - } } public void payCancel(String orderId, String payId, String remark) { XmTaskBidOrder orderDb = this.selectOneById(orderId); 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 e95a4f30..3e7b46f8 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 @@ -26,6 +26,24 @@ public class SysClient { @Autowired Push push; + + /** + * 查询用户详细资料 + * @param userid + * @return + */ + public User getUserInterestsByUserid(String userid){ + String url="/sys/sys/user/noauth/detail?userid={userid}"; + Map re=callBizService.getForMap(url,map("userid",userid)); + Map data= (Map) re.get("data"); + if(data==null || data.isEmpty()){ + return null; + } + User user=BaseUtils.fromMap(data,User.class); + return user; + + } + /** * 查询用户详细资料 * @param userid