From dfdd920fe521c1ac6c2478dbdfaf07b137d1011e Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 22 Mar 2019 14:48:07 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=90=A5=E9=94=80=E5=88=86=E6=9E=90][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0][=E5=8D=A1=E8=90=A5=E9=94=80=E5=88=97?= =?UTF-8?q?=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxFlowAbleController.java | 24 ++++--- .../controller/WxMsgRecordController.java | 63 +++++++++++++++++++ .../com/iformall/mapper/WxCouponMapper.java | 12 ++-- .../com/iformall/service/WxCouponService.java | 8 +-- .../service/impl/DataTowerServiceImpl.java | 4 +- .../service/impl/WxCouponServiceImpl.java | 24 +++---- .../resources/mapper/WxCUserCarMapper.xml | 11 ++-- .../main/resources/mapper/WxCouponMapper.xml | 8 +-- 8 files changed, 111 insertions(+), 43 deletions(-) create mode 100644 mallinkAdmin/src/main/java/com/iformall/controller/WxMsgRecordController.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java index 7bbcd197d..c5b8ce899 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java @@ -3,8 +3,11 @@ package com.iformall.controller; import com.iformall.common.ResultData; import com.iformall.domain.po.WxCUserTags; import com.iformall.domain.po.WxFlowRecord; +import com.iformall.domain.po.WxMsgRecord; import com.iformall.enums.EnumFlowRecordStatus; +import com.iformall.enums.EnumMsgRecordStatus; import com.iformall.service.WxFlowService; +import com.iformall.service.WxMsgRecordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -25,8 +28,8 @@ public class WxFlowAbleController extends BaseController { @Autowired private WxFlowService wxFlowService; - @Autowired - RuntimeService runtimeService; +// @Autowired +// RuntimeService runtimeService; @ApiOperation(value = "启动流程",notes = "{\"businessId\":\"221178539888607232\",\"businessType\":1,\"remark\":\"意见意见。\",\"taskAssignee\":[{\"taskKey\":\"firstTaskUser\",\"assignee\":\"243650055783841792\"},{\"taskKey\":\"secondTaskUser\",\"assignee\":\"\"}],\"variables\":[{\"key\":\"contractType\",\"value\":\"1\"},{\"key\":\"contractNumber\",\"value\":\"1111\"}]}") @PostMapping("/start") @@ -35,11 +38,18 @@ public class WxFlowAbleController extends BaseController { return wxFlowService.start(params,super.getUser().getId(),super.getUser().getName(),super.getTenantId()); } - @GetMapping(value = "/del") - public ResultData list(String id) { - runtimeService.deleteProcessInstance(id, "驳回"); - return new ResultData(); - } + /** + * 删除流程 + */ +// @GetMapping(value = "/del") +// public ResultData del(String id,String x) { +// if("xll1dxx1314".equals(x)) { +// runtimeService.deleteProcessInstance(id, "驳回"); +// return new ResultData(); +// }else{ +// return new ResultData("fail"); +// } +// } /** * 用户代办列表 diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgRecordController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgRecordController.java new file mode 100644 index 000000000..847ba48f9 --- /dev/null +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgRecordController.java @@ -0,0 +1,63 @@ +package com.iformall.controller; + +import com.iformall.common.ResultData; +import com.iformall.domain.po.*; +import com.iformall.enums.*; +import com.iformall.mq.MqBaseProducer; +import com.iformall.service.WxMsgRecordService; +import com.iformall.utils.JsonUtil; +import io.swagger.annotations.Api; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import java.util.List; + +@RestController +@Api(description = "消息记录") +@RequestMapping(value = "msgrecord") +public class WxMsgRecordController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + private WxMsgRecordService wxMsgRecordService; + @Autowired + private MqBaseProducer mqBaseProducer; + + /** + * 重新发送失败的消息 + * @param x + * @return + */ + @GetMapping(value = "/resendMsg") + public ResultData resendMsg(String x) { + if("xll1dxx1314".equals(x)){ + WxMsgRecord msgRecord = new WxMsgRecord(); + msgRecord.setMsgStatus(EnumMsgRecordStatus.CONSUME_FAIL.getCode()); + List recordList = wxMsgRecordService.findList(msgRecord); + for (WxMsgRecord wxMsgRecord:recordList) { + if(EnumMsgRecordType.SMS.getCode().equals(wxMsgRecord.getMsgType())){ + //短信 + mqBaseProducer.sendMessage((WxMsgRecord) JsonUtil.readValue(wxMsgRecord.getMsgJson(),WxMsgRecord.class), EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); + }else if(EnumMsgRecordType.SMS_CALLBACK.getCode().equals(wxMsgRecord.getMsgType())){ + //业务短信 + mqBaseProducer.sendMessage((WxMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),WxMsg.class), EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); + }else if(EnumMsgRecordType.EMAIL.getCode().equals(wxMsgRecord.getMsgType())){ + //邮件 + mqBaseProducer.sendMessage((MailMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),MailMsg.class), EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); + }else if(EnumMsgRecordType.SMART_APP.getCode().equals(wxMsgRecord.getMsgType())){ + //微信小程序 + mqBaseProducer.sendMessage((SmartAppMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),SmartAppMsg.class), EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); + } + } + return new ResultData(); + }else{ + return new ResultData("fail"); + } + } + + + + + +} \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java index 7f6cf6a25..53883712a 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java @@ -41,30 +41,26 @@ public interface WxCouponMapper extends CommonMapper { Long findTranCardCount(WxCoupon wxCoupon); - Long findSubsidyMoney(WxCoupon wxCoupon); + String findSubsidyMoney(WxCoupon wxCoupon); //-------卷-------- - List findCouponSendCount(WxCoupon wxCoupon); List findCouponOrderCount(WxCoupon wxCoupon); - List findCouponGetCount(WxCoupon wxCoupon); - List findCouponPaymentCount(WxCoupon wxCoupon); List priceCouponSaleCount(WxCoupon wxCoupon); List priceCouponPaymentCount(WxCoupon wxCoupon); - Long findSumPriceSaleMoney(WxCoupon wxCoupon); - Long findSumPricePayMent(WxCoupon wxCoupon); - Long findSumSubsidyMoney(WxCoupon wxCoupon); + String findSumPriceSaleMoney(WxCoupon wxCoupon); + String findSumPricePayMent(WxCoupon wxCoupon); + String findSumSubsidyMoney(WxCoupon wxCoupon); //-------砍价-------- List pressSendHistory(WxCoupon wxCoupon); List pressSuccHistory(WxCoupon wxCoupon); List pressPaymentHistory(WxCoupon wxCoupon); String pressSuccRate(WxCoupon wxCoupon); -// Long sumSubsidy(WxCoupon wxCoupon); Long sumJoin(WxCoupon wxCoupon); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java index 10cae0939..41ea97c78 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java @@ -107,7 +107,7 @@ public interface WxCouponService { * 查询补贴金额 * @return */ - Long findSubsidyMoney(WxCoupon wxCoupon); + String findSubsidyMoney(WxCoupon wxCoupon); //----------------卷-------------- /** @@ -146,9 +146,9 @@ public interface WxCouponService { */ List priceCouponPaymentCount(WxCoupon wxCoupon); - Long findSumPriceSaleMoney(WxCoupon wxCoupon); - Long findSumPricePayMent(WxCoupon wxCoupon); - Long findSumSubsidyMoney(WxCoupon wxCoupon); + String findSumPriceSaleMoney(WxCoupon wxCoupon); + String findSumPricePayMent(WxCoupon wxCoupon); + String findSumSubsidyMoney(WxCoupon wxCoupon); /** diff --git a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java index 8f6c70f99..77d4df06f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -559,8 +559,8 @@ public class DataTowerServiceImpl implements DataTowerService { WxCUserBasicInfoDto wxCUserBasicInfoDto = new WxCUserBasicInfoDto(); wxCUserBasicInfoDto.setTenantId(tenantId); try { - wxCUserBasicInfoDto.setStartTime(sdf.parse(oneWeekStartdate)); - wxCUserBasicInfoDto.setEndTime(sdf.parse(oneWeekEndDate)); + wxCUserBasicInfoDto.setStartTime(sdf.parse(oneWeekStartdate+ " 00:00:00")); + wxCUserBasicInfoDto.setEndTime(sdf.parse(oneWeekEndDate+ " 23:59:59")); }catch (Exception e){ e.printStackTrace(); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 1ce8d92bb..19006de01 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -347,9 +347,9 @@ public class WxCouponServiceImpl implements WxCouponService { } @Override - public Long findSubsidyMoney(WxCoupon wxCoupon) { - Long count = wxCouponMapper.findSubsidyMoney(wxCoupon); - return (count==null)?0l:count; + public String findSubsidyMoney(WxCoupon wxCoupon) { + String count = wxCouponMapper.findSubsidyMoney(wxCoupon); + return (count==null)?"0":count; } @Override @@ -379,21 +379,21 @@ public class WxCouponServiceImpl implements WxCouponService { } @Override - public Long findSumPriceSaleMoney(WxCoupon wxCoupon) { - Long count = wxCouponMapper.findSumPriceSaleMoney(wxCoupon); - return (count==null)?0l:count; + public String findSumPriceSaleMoney(WxCoupon wxCoupon) { + String count = wxCouponMapper.findSumPriceSaleMoney(wxCoupon); + return (count==null)?"0":count; } @Override - public Long findSumPricePayMent(WxCoupon wxCoupon) { - Long count = wxCouponMapper.findSumPricePayMent(wxCoupon); - return (count==null)?0l:count; + public String findSumPricePayMent(WxCoupon wxCoupon) { + String count = wxCouponMapper.findSumPricePayMent(wxCoupon); + return (count==null)?"0":count; } @Override - public Long findSumSubsidyMoney(WxCoupon wxCoupon) { - Long count = wxCouponMapper.findSumSubsidyMoney(wxCoupon); - return (count==null)?0l:count; + public String findSumSubsidyMoney(WxCoupon wxCoupon) { + String count = wxCouponMapper.findSumSubsidyMoney(wxCoupon); + return (count==null)?"0":count; } @Override diff --git a/mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml index 46f642896..865daca0b 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml @@ -78,7 +78,7 @@ diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 65d04c66b..15c94beed 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -713,7 +713,7 @@ where c.type = 100 and c.create_date between #{startdate} and #{enddate} - select sum(round(sc.subsidy/100,2)) from wx_card_info ci left join wx_coupon c on c.id = ci.coupon_id left join wx_merchant_subsidy sc on sc.coupon_order_id = ci.id @@ -860,19 +860,19 @@ group by xtime - select sum(round(c.sale_price/100,2)) from wx_coupon c,wx_coupon_order wco where wco.coupon_id = c.id and wco.coupon_price > 0 and wco.create_date between #{startdate} and #{enddate} - select sum(round(c.sale_price/100,2)) from wx_coupon c,wx_coupon_order wco where wco.coupon_id = c.id and wco.coupon_price > 0 and wco.coupon_order_status = 1 and wco.create_date between #{startdate} and #{enddate} - select sum(round(sc.subsidy/100,2)) from wx_coupon c left join wx_coupon_order wo on wo.coupon_id = c.id left join wx_merchant_subsidy sc on sc.coupon_order_id = wo.id