From 5646746fb5375e0e06171af8cfd30056410b6522 Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 15 Mar 2019 14:50:22 +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/WxCouponController.java | 6 +-- .../java/com/iformall/domain/po/BaseMsg.java | 4 ++ .../com/iformall/mapper/WxCouponMapper.java | 13 +++++++ .../iformall/mapper/WxMsgRecordMapper.java | 3 +- .../com/iformall/service/WxCouponService.java | 37 +++++++++++++++++++ .../service/impl/WxCouponServiceImpl.java | 30 +++++++++++++++ .../service/impl/WxMsgRecordServiceImpl.java | 4 +- .../main/resources/mapper/WxCouponMapper.xml | 32 ++++++++-------- .../resources/mapper/WxMsgRecordMapper.xml | 12 ++++++ 9 files changed, 120 insertions(+), 21 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java index e8cbe6aef..b957c3cce 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java @@ -122,12 +122,12 @@ public class WxCouponController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData findCountData(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { + //默认时间本月第一天,截止到当天 Map result = new HashedMap(); if(wxCoupon.getStartdate() == null){ - //获取当前月第一天 Calendar c = Calendar.getInstance(); c.add(Calendar.MONTH, 0); - c.set(Calendar.DAY_OF_MONTH,1);//设置为1号,当前日期既为本月第一天 + c.set(Calendar.DAY_OF_MONTH,1); wxCoupon.setStartdate(c.getTime()); } if(wxCoupon.getEnddate() == null){ @@ -182,7 +182,7 @@ public class WxCouponController extends BaseController { for (WxCoupon coupon:paymentList){ payMentMap.put(coupon.getXtime(),coupon.getSumPayment()); } - result.put("list",wxCouponService.findCountData(wxCoupon,pageNum,pageSize)); + result.put("list",wxCouponService.findCouponData(wxCoupon,pageNum,pageSize)); result.put("saleHistory",saleMap); result.put("paymentHistory",payMentMap); result.put("saleCardCount",wxCouponService.findSaleCardCount(wxCoupon)); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/BaseMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/BaseMsg.java index d9fb1c4f0..c19ade6cd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/BaseMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/BaseMsg.java @@ -11,15 +11,19 @@ public class BaseMsg implements Serializable { private static final long serialVersionUID = 923764283764823L; //唯一标识 + @Transient private String uuid; //消息类型 1短信 2回调短信 3邮件 4微信小程序模板 5微信公众号模板 6系统通知 + @Transient private Integer msgType; //消息状态 0默认1发送成功2消费成功3消费失败 + @Transient private Integer msgStatus; //结果信息 + @Transient private String statusMessage; //延迟消息1s,5s,10s,30s,1m,2m,3m,4m,5m,6m,7m,8m,9m,10m,20m,30m,1h,2h diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java index 0de74f01f..e38d0681c 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java @@ -41,4 +41,17 @@ public interface WxCouponMapper extends CommonMapper { Long findTranCardCount(WxCoupon wxCoupon); Long findSubsidyMoney(WxCoupon wxCoupon); + + //-------卷-------- + Long findCouponSendCount(WxCoupon wxCoupon); + + Long findCouponOrderCount(WxCoupon wxCoupon); + + Long findCouponGetCount(WxCoupon wxCoupon); + + Long findCouponPaymentCount(WxCoupon wxCoupon); + + Long priceCouponSaleCount(WxCoupon wxCoupon); + + Long priceCouponPaymentCount(WxCoupon wxCoupon); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMsgRecordMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMsgRecordMapper.java index 04b6d3343..0cc02bf2d 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMsgRecordMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMsgRecordMapper.java @@ -13,5 +13,6 @@ public interface WxMsgRecordMapper extends CommonMapper { List findList(WxMsgRecord record); void update(WxMsgRecord record); - + + void save(WxMsgRecord record); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java index 500754929..e14a3362f 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java @@ -99,4 +99,41 @@ public interface WxCouponService { * @return */ Long findSubsidyMoney(WxCoupon wxCoupon); + + //----------------卷-------------- + /** + * 卷发放数量 + * @return + */ + Long findCouponSendCount(WxCoupon wxCoupon); + + /** + * 卷购买数量 + * @return + */ + Long findCouponOrderCount(WxCoupon wxCoupon); + + /** + * 卷领取数量 + * @return + */ + Long findCouponGetCount(WxCoupon wxCoupon); + + /** + * 卷核销数量 + * @return + */ + Long findCouponPaymentCount(WxCoupon wxCoupon); + + /** + * 有价卷销售数量 + * @return + */ + Long priceCouponSaleCount(WxCoupon wxCoupon); + + /** + * 有价卷核销数量 + * @return + */ + Long priceCouponPaymentCount(WxCoupon wxCoupon); } 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 28f77a14e..be717bedc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -354,4 +354,34 @@ public class WxCouponServiceImpl implements WxCouponService { public PageInfo findCouponData(WxCoupon record, Integer pageNum, Integer pageSize) { return null; } + + @Override + public Long findCouponSendCount(WxCoupon wxCoupon) { + return null; + } + + @Override + public Long findCouponOrderCount(WxCoupon wxCoupon) { + return null; + } + + @Override + public Long findCouponGetCount(WxCoupon wxCoupon) { + return null; + } + + @Override + public Long findCouponPaymentCount(WxCoupon wxCoupon) { + return null; + } + + @Override + public Long priceCouponSaleCount(WxCoupon wxCoupon) { + return null; + } + + @Override + public Long priceCouponPaymentCount(WxCoupon wxCoupon) { + return null; + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java index 9b7004e86..981c72fcb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java @@ -24,11 +24,11 @@ public class WxMsgRecordServiceImpl implements WxMsgRecordService { if(data instanceof WxMsgRecord){ WxMsgRecord msgRecord = (WxMsgRecord)data; msgRecord.setMsgJson(JsonUtil.obj2Json(data)); - wxMsgRecordMapper.insertSelective(msgRecord); + wxMsgRecordMapper.save(msgRecord); }else if(data instanceof WxMsg || data instanceof MailMsg){ WxMsgRecord msgRecord = new WxMsgRecord(); msgRecord.setMsgJson(JsonUtil.obj2Json(data)); - wxMsgRecordMapper.insertSelective(msgRecord); + wxMsgRecordMapper.save(msgRecord); } } diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 4f4f2a9ed..10e2b0ee1 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -713,7 +713,7 @@ + + diff --git a/mallinkService/src/main/resources/mapper/WxMsgRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgRecordMapper.xml index bbd23ccea..65c66c507 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgRecordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgRecordMapper.xml @@ -77,5 +77,17 @@ + + INSERT INTO wx_msg_record( `uuid`, `msg_type`, + `domain`, `msg`, `send_time`, `model_id`, `model_type`, + `signature`, `sender`, `sender_user_id`, `sender_user_name`, + `receiver`, `receiver_user_id`, `receiver_user_name`, + `msg_status`, `status_message`, `msg_json`) + VALUES(#{uuid},#{msgType}, + #{domain},#{msg},#{sendTime},#{modelId},#{modelType},#{signature},#{sender}, + #{senderUserId},#{senderUserName},#{receiver},#{receiverUserId},#{receiverUserName}, + #{msgStatus},#{statusMessage},#{msgJson}); + +