From 208f4b85733b04efee57bcf7a51406900b5156be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Wed, 6 Jul 2022 17:03:22 +0800 Subject: [PATCH] task_order --- .../xm/core/ctrl/XmTaskOrderController.java | 10 +++++++ .../java/com/xm/core/entity/XmTaskOrder.java | 3 ++ .../xm/core/service/XmTaskOrderService.java | 30 ++++++++++++++++++- 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskOrderController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskOrderController.java index 7e313f11..1b677429 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskOrderController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskOrderController.java @@ -7,12 +7,14 @@ import com.mdp.core.utils.RequestUtils; import com.mdp.core.utils.ResponseHelper; import com.mdp.meta.client.entity.ItemVo; import com.mdp.meta.client.service.ItemService; +import com.mdp.msg.client.PushNotifyMsgService; import com.mdp.mybatis.PageUtils; import com.mdp.safe.client.entity.User; import com.mdp.safe.client.utils.LoginUtils; import com.mdp.swagger.ApiEntityParams; import com.xm.core.entity.XmTask; import com.xm.core.entity.XmTaskOrder; +import com.xm.core.service.XmRecordService; import com.xm.core.service.XmTaskOrderService; import com.xm.core.service.XmTaskService; import com.xm.core.vo.AddXmTaskOrderVo; @@ -54,6 +56,13 @@ public class XmTaskOrderController { @Autowired ItemService itemService; + + + @Autowired + PushNotifyMsgService msgService; + + @Autowired + XmRecordService xmRecordService; Map fieldsMap = toMap(new XmTaskOrder()); @@ -427,6 +436,7 @@ public class XmTaskOrderController { return failed("data-0","订单Id不能为空"); } xmTaskOrderService.orderPaySuccess(order.getId(),order.getPayId(),order.getPrepayId(), order.getTranId(), order.getPayAt(), order.getRemark()); + m.put("tips", tips); return m; }catch (BizException e) { diff --git a/xm-core/src/main/java/com/xm/core/entity/XmTaskOrder.java b/xm-core/src/main/java/com/xm/core/entity/XmTaskOrder.java index 50f032d7..bf360c85 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmTaskOrder.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmTaskOrder.java @@ -173,6 +173,9 @@ public class XmTaskOrder implements java.io.Serializable { @ApiModelProperty(notes="订单业务类型1-保证金，2-营销推广活动",allowEmptyValue=true,example="",allowableValues="") String bizType; + @ApiModelProperty(notes="订单业务类型1-保证金，2-营销推广活动",allowEmptyValue=true,example="",allowableValues="") + String projectId; + /** *订单编号 **/ diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskOrderService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskOrderService.java index 985c2d01..83e6a94a 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskOrderService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskOrderService.java @@ -2,6 +2,7 @@ package com.xm.core.service; import com.mdp.core.err.BizException; import com.mdp.core.service.BaseService; +import com.mdp.msg.client.PushNotifyMsgService; import com.xm.core.entity.XmTask; import com.xm.core.entity.XmTaskOrder; import org.apache.commons.lang3.time.DateUtils; @@ -14,7 +15,10 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
@@ -28,6 +32,12 @@ public class XmTaskOrderService extends BaseService { @Autowired XmTaskService xmTaskService; + @Autowired + PushNotifyMsgService msgService; + + @Autowired + XmRecordService xmRecordService; + @Transactional public void orderPaySuccess(String orderId, String payId, String prepayId, String tranId, BigDecimal payAt, String remarks) { @@ -56,42 +66,60 @@ public class XmTaskOrderService extends BaseService { //设置付款确认时间 order.setPayTime(new Date()); - + List marketNames=new ArrayList<>(); order.setId(taskOrderDb.getId() ); if("1".equals(taskOrderDb.getBizType())){ if("1".equals(taskOrderDb.getEstate()) && taskOrderDb.getEfunds()!=null && taskOrderDb.getEfunds().compareTo(BigDecimal.ZERO)>0){ order.setEstate("2"); + order.setEtoPlatTime(new Date()); } }else if("2".equals(taskOrderDb.getBizType())){ if("1".equals(taskOrderDb.getTop())){ order.setTop("2"); order.setTopStime(new Date()); order.setTopEtime(DateUtils.addDays(new Date(),taskOrderDb.getTopDays())); + marketNames.add("置顶"); } if("1".equals(taskOrderDb.getHot())){ order.setHot("2"); order.setHotStime(new Date()); order.setHotEtime(DateUtils.addDays(new Date(),taskOrderDb.getHotDays())); + marketNames.add("上热门"); } if("1".equals(taskOrderDb.getUrgent())){ order.setUrgent("2"); order.setUrgentStime(new Date()); order.setUrgentEtime(DateUtils.addDays(new Date(),taskOrderDb.getUrgentDays())); + marketNames.add("加急"); } if("1".equals(taskOrderDb.getCrmSup())){ order.setCrmSup("2"); + marketNames.add("客服包办"); } if("1".equals(taskOrderDb.getOshare())&& taskOrderDb.getShareFee()!=null && taskOrderDb.getShareFee().compareTo(BigDecimal.ZERO)>0){ order.setOshare("2"); + marketNames.add("分享赚"); } } order.setPayAt(payAt); BeanUtils.copyProperties(order,xmTaskUpdate); xmTaskUpdate.setId(taskOrderDb.getTaskId()); + //托管资金后用户开始工作 + if("1".equals(taskOrderDb.getBizType()) && "2".equals(xmTaskUpdate.getEstate()) && "1".equals(taskOrderDb.getEstate())){ + xmTaskUpdate.setBidStep("5"); + } this.xmTaskService.updateSomeFieldByPk(xmTaskUpdate); 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(","))+"】"); + } }