From 2d4db2bc6e0819fe16424fd87cbcb96b1ad23ae9 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 25 Aug 2018 15:23:08 +0800 Subject: [PATCH 01/64] =?UTF-8?q?[C=E7=AB=AF=E7=99=BB=E5=BD=95][=E6=96=B0?= =?UTF-8?q?=E5=A2=9E]:=E6=88=90=E9=95=BF=E5=80=BC=E8=AE=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/simple/controller/WxUserGrantController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/simple/controller/WxUserGrantController.java index 88e22ca76..fa62097cd 100755 --- a/mallinkCApi/src/main/java/com/simple/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxUserGrantController.java @@ -106,6 +106,7 @@ public class WxUserGrantController extends BaseController { user1.setSessionKey(session_key); if (user1.getSceneAddress() == null) user1.setSceneAddress(sceneAddress); + // TODO 成长值 wxCUserService.saveOrUpdate(user1); resultMap.put("token", token); } else { @@ -115,8 +116,8 @@ public class WxUserGrantController extends BaseController { user.setRegisterIp(ipaddress); if (user.getSceneAddress() == null) user.setSceneAddress(sceneAddress); - user.setSessionKey(session_key); + // TODO 成长值 wxCUserService.saveOrUpdate(user); resultMap.put("token", token); } From c74eb5caa1626ba6f1ae7faf49f3214cee964509 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 25 Aug 2018 15:23:08 +0800 Subject: [PATCH 02/64] =?UTF-8?q?[=E4=BC=9A=E5=91=98=E7=AE=A1=E7=90=86][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E8=AF=A6=E6=83=85=E5=92=8C=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/simple/controller/WxCUserBasicInfoController.java | 2 +- .../src/main/java/com/simple/domain/po/MallUserInfo.java | 1 + .../src/main/resources/mapper/WxCUserBasicInfoMapper.xml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java index f60ce2cc1..7f3596889 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java @@ -149,7 +149,7 @@ public class WxCUserBasicInfoController extends BaseController public ResultData findById(Long id) { WxCUserBasicInfo info = wxCUserBasicInfoService.getById(id); if(info.getTagId()!=null) { - WxCUserTags uTag = wxCUserTagsService.getById(id); + WxCUserTags uTag = wxCUserTagsService.getById(info.getTagId()); if(StringUtils.isNotBlank(uTag.getTags())) { List ids = JSONObject.parseArray(uTag.getTags(),Long.class); WxTags wxTags =new WxTags(); diff --git a/mallinkService/src/main/java/com/simple/domain/po/MallUserInfo.java b/mallinkService/src/main/java/com/simple/domain/po/MallUserInfo.java index 3c6a4665b..9cf5b37cd 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/MallUserInfo.java +++ b/mallinkService/src/main/java/com/simple/domain/po/MallUserInfo.java @@ -74,6 +74,7 @@ public class MallUserInfo implements Serializable { @Transient private List permission; //拥有的菜单权限 + @Transient private String menus; public String getMenus() { diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index b4315b23b..fc9c210a5 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -22,7 +22,7 @@ `id`,`phone`,`birthdate`,`education`,`sex`,`email`,`address`,`poins`,`tag_id`,`c_user_id`, - `create_date`,`update_date`,`tenant_id`,`name`,level,nickName + `create_date`,`update_date`,`tenant_id`,`name`,level,nick_name From 09a5542e5eaff8ba92ecd74022191ac1cab8cc08 Mon Sep 17 00:00:00 2001 From: "jinguo24@163.com" Date: Sun, 26 Aug 2018 11:38:44 +0800 Subject: [PATCH 03/64] =?UTF-8?q?[=E6=A0=87=E7=AD=BE][=E6=9F=A5=E8=AF=A2]?= =?UTF-8?q?=E4=BF=AE=E6=94=B9json=20=E6=9F=A5=E8=AF=A2=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/simple/mapper/WxCUserTagsMapper.java | 4 +--- .../main/java/com/simple/service/impl/WxMsgServiceImpl.java | 3 ++- .../src/main/resources/mapper/WxCUserTagsMapper.xml | 6 +----- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCUserTagsMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCUserTagsMapper.java index e31b4c361..3dd4476a2 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCUserTagsMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCUserTagsMapper.java @@ -9,10 +9,8 @@ import org.apache.ibatis.annotations.Param; public interface WxCUserTagsMapper extends CommonMapper { List findList(WxCUserTags wxCUserTags); - - long findCountByTag(List tagIds); - List findUserByTag(List tagIds); + List findUserByTag(@Param("tagIds")String tagIds); long findCountByTags(@Param("tagIds")String tagIds); diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMsgServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMsgServiceImpl.java index 9676435c4..42250e008 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMsgServiceImpl.java @@ -1,5 +1,6 @@ package com.simple.service.impl; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -122,7 +123,7 @@ public class WxMsgServiceImpl implements WxMsgService { for (int i = 0; i < arys.length; i++) { tagids.add(Long.parseLong(arys[i])); } - List userIds = wxCUserTagsMapper.findUserByTag(tagids); + List userIds = wxCUserTagsMapper.findUserByTag(JSON.toJSONString(tagids)); if(userIds.size()==0) { return ""; } diff --git a/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml index 1225b888e..264c629b0 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml @@ -60,12 +60,8 @@ - - + + select count(id) from wx_c_user_basic_info where sex =#{sex} + + and create_date >= #{startTime} + + + and create_date <= #{endTime} + + - + + From 3495f4e0aa42485605202cd383631f822de57eb2 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sun, 26 Aug 2018 13:05:18 +0800 Subject: [PATCH 05/64] =?UTF-8?q?[C=E7=AB=AF=E7=99=BB=E5=BD=95][=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D]:=E7=94=A8=E6=88=B7=E6=8E=88=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/simple/controller/WxUserGrantController.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/simple/controller/WxUserGrantController.java index fa62097cd..afea62da8 100755 --- a/mallinkCApi/src/main/java/com/simple/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxUserGrantController.java @@ -243,13 +243,13 @@ public class WxUserGrantController extends BaseController { public ResultData checkUserStatus() { Map resultMap = new HashMap(); WxCUser user = getUser(); - if (!StringUtils.isBlank(user.getUnionId())) { - resultMap.put("unionId", user.getUnionId()); + if (!StringUtils.isBlank(user.getNickName())) { + resultMap.put("nickName", user.getNickName()); + } + if (StringUtils.isBlank(user.getNickName())) { + logger.warn("用户昵称未授权,跳转到用户授权页!"); + return new ResultData(ErrorCode.NICK_NAME_NOT_FOUND.getCode(), "用户昵称未授权,请跳转到用户昵称授权页!", resultMap); } - //if (StringUtils.isBlank(user.getUnionId())) { - // logger.warn("用户昵称未授权,跳转到用户授权页!"); - // return new ResultData(ErrorCode.NICK_NAME_NOT_FOUND.getCode(), "用户昵称未授权,请跳转到用户昵称授权页!", resultMap); - //} return new ResultData(Result.SUCCESS, "是老用户,已完成所有授权", resultMap); } From 7446c58570c4077e6711b3e5d38013bb28b55e07 Mon Sep 17 00:00:00 2001 From: "jinguo24@163.com" Date: Sun, 26 Aug 2018 13:19:21 +0800 Subject: [PATCH 06/64] =?UTF-8?q?[=E4=BC=9A=E5=91=98=E7=AE=A1=E7=90=86][?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D]mapper=20=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxCUserBasicInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index 3dea8e76e..67c17a31e 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -152,7 +152,7 @@ - select count(id) from wx_c_user_basic_info where create_date >= #{startTime} and create_date <= #{endTime} From 95d0c7a187c5ff3339d20dd70b869a3e1516fe4d Mon Sep 17 00:00:00 2001 From: "jinguo24@163.com" Date: Sun, 26 Aug 2018 13:32:20 +0800 Subject: [PATCH 07/64] =?UTF-8?q?[=E4=BC=9A=E5=91=98][=E4=BF=AE=E5=A4=8D]?= =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/simple/controller/WxCUserBasicInfoController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java index 59256f700..bc6ea276b 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java @@ -222,7 +222,7 @@ public class WxCUserBasicInfoController extends BaseController } @ApiOperation("查询会员年龄结构") - @GetMapping("/findUserSexStructure") + @GetMapping("/findUserAgeStructure") public ResultData findUserAgeStructure() { From 4cacdf612ea4291b785512f38f201609ebc3c086 Mon Sep 17 00:00:00 2001 From: "jinguo24@163.com" Date: Sun, 26 Aug 2018 13:34:41 +0800 Subject: [PATCH 08/64] =?UTF-8?q?[=E5=B9=B4=E9=BE=84=E6=AE=B5][=E6=96=B0?= =?UTF-8?q?=E5=A2=9E]=E6=96=B0=E5=A2=9E=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/simple/enums/EnumAgeInfo.java | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 mallinkService/src/main/java/com/simple/enums/EnumAgeInfo.java diff --git a/mallinkService/src/main/java/com/simple/enums/EnumAgeInfo.java b/mallinkService/src/main/java/com/simple/enums/EnumAgeInfo.java new file mode 100644 index 000000000..515b7292c --- /dev/null +++ b/mallinkService/src/main/java/com/simple/enums/EnumAgeInfo.java @@ -0,0 +1,59 @@ +package com.simple.enums; + +public enum EnumAgeInfo { + FIRST_SLOT(1,0,18,"18岁以下"), + SECOND_SLOT(2,18,24,"18岁-24岁"), + THIRD_SLOT(3,18,24,"18岁-24岁"), + FOURTH_SLOT(4,18,24,"18岁-24岁"), + FIFTH_SLOT(5,18,24,"18岁-24岁"), + SIXTH_SLOT(6,18,24,"18岁-24岁"), + SEVENTH_SLOT(7,18,24,"18岁-24岁") + ; + + private EnumAgeInfo(Integer sortNum,Integer start,Integer end,String desc) { + this.sortNum =sortNum; + this.start=start; + this.end = end; + this.desc =desc; + } + private Integer sortNum; + + private Integer start; + + private Integer end; + + private String desc; + + public Integer getStart() { + return start; + } + + public void setStart(Integer start) { + this.start = start; + } + + public Integer getEnd() { + return end; + } + + public void setEnd(Integer end) { + this.end = end; + } + + public String getDesc() { + return desc; + } + + public void setDesc(String desc) { + this.desc = desc; + } + + public Integer getSortNum() { + return sortNum; + } + + public void setSortNum(Integer sortNum) { + this.sortNum = sortNum; + } + +} From fe821c9d7fa91deefcf0388b030fac537a591445 Mon Sep 17 00:00:00 2001 From: "jinguo24@163.com" Date: Sun, 26 Aug 2018 14:33:39 +0800 Subject: [PATCH 09/64] =?UTF-8?q?[=E4=BC=9A=E5=91=98=E7=BB=93=E6=9E=84][?= =?UTF-8?q?=E6=96=B0=E5=A2=9E]=E6=A0=B9=E6=8D=AE=E5=B9=B4=E9=BE=84?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxCUserBasicInfoController.java | 43 ++++++++++++++++--- .../controller/WxLevelConfigController.java | 8 ++-- .../java/com/simple/enums/EnumAgeInfo.java | 10 ++--- .../java/com/simple/mapper/WxCUserMapper.java | 7 ++- .../com/simple/service/WxCUserService.java | 10 +++-- .../impl/WxCUserBasicInfoServiceImpl.java | 12 +++--- .../service/impl/WxCUserServiceImpl.java | 7 +++ .../mapper/WxCUserBasicInfoMapper.xml | 14 +++--- .../main/resources/mapper/WxCUserMapper.xml | 10 +++++ 9 files changed, 91 insertions(+), 30 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java index bc6ea276b..645ad14e3 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java @@ -2,6 +2,7 @@ package com.simple.controller; import java.text.NumberFormat; import java.util.ArrayList; +import java.util.Calendar; import java.util.Date; import java.util.List; @@ -28,6 +29,7 @@ import com.simple.domain.po.WxCoupon; import com.simple.domain.po.WxCouponOrder; import com.simple.domain.po.WxTags; import com.simple.domain.vo.UserStructureVo; +import com.simple.enums.EnumAgeInfo; import com.simple.service.WxCUserBasicInfoService; import com.simple.service.WxCUserService; import com.simple.service.WxCUserTagsService; @@ -206,30 +208,61 @@ public class WxCUserBasicInfoController extends BaseController WxCuerBasicInfoDto dto = new WxCuerBasicInfoDto(); dto.setStartTime(startTime); dto.setEndTime(endTime); - dto.setSex(0); //保密 - long secrecy = wxCUserBasicInfoService.findCountBySex(dto); + dto.setSex(0); + long secrecy = getCount(dto); dto.setSex(1); - long boy = wxCUserBasicInfoService.findCountBySex(dto); + long boy = getCount(dto); dto.setSex(2); - long girl=wxCUserBasicInfoService.findCountBySex(dto); + long girl=getCount(dto); Long all =secrecy+boy+girl; List vos = new ArrayList<>(); - vos.add(getVo(secrecy, all, "保密")); vos.add(getVo(boy, all, "男")); vos.add(getVo(girl, all, "女")); + vos.add(getVo(secrecy, all, "保密")); return new ResultData(vos); } @ApiOperation("查询会员年龄结构") @GetMapping("/findUserAgeStructure") public ResultData findUserAgeStructure() { + Calendar c = Calendar.getInstance(); + + for(EnumAgeInfo a:EnumAgeInfo.values()) { + c.clear(); + c.setTime(new Date()); + c.set(Calendar.HOUR_OF_DAY, 0); + c.set(Calendar.MINUTE,0); + c.set(Calendar.SECOND,0); + long count = getCountByAge(a, c); + } return new ResultData(); } + private long getCountByAge(EnumAgeInfo a,Calendar c) { + WxCuerBasicInfoDto dto =new WxCuerBasicInfoDto(); + c.add(Calendar.YEAR, -a.getEnd()); + Date startTime = c.getTime(); + c.clear(); + c.setTime(startTime); + c.add(Calendar.YEAR,a.getEnd()-a.getStart()); + Date endTime = c.getTime(); + dto.setStartTime(startTime); + dto.setEndTime(endTime); + return wxCUserBasicInfoService.findCountByAge(dto); + } + + + //通过性别获取数量 + private long getCount(WxCuerBasicInfoDto dto) { + //TODO 考虑性能问题,暂不处理少量重复问题,后续可考虑大数据处理 + return wxCUserBasicInfoService.findCountBySex(dto)+ + wxCUserService.findCountBySex(dto); + } + private UserStructureVo getVo(long count,long all,String name) { UserStructureVo vo = new UserStructureVo(); vo.setName(name); diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxLevelConfigController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxLevelConfigController.java index 72fc73465..343467087 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxLevelConfigController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxLevelConfigController.java @@ -72,10 +72,10 @@ public class WxLevelConfigController extends BaseController // } @ApiOperation("根据id删除接口") - @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData delete(Long id) { - wxLevelConfigService.deleteById(id); + @PostMapping("/del") +// @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(@RequestBody WxLevelConfig wxLevelConfig) { + wxLevelConfigService.deleteById(wxLevelConfig.getId()); return new ResultData(Result.SUCCESS, "删除成功", null); } diff --git a/mallinkService/src/main/java/com/simple/enums/EnumAgeInfo.java b/mallinkService/src/main/java/com/simple/enums/EnumAgeInfo.java index 515b7292c..15e14a346 100644 --- a/mallinkService/src/main/java/com/simple/enums/EnumAgeInfo.java +++ b/mallinkService/src/main/java/com/simple/enums/EnumAgeInfo.java @@ -3,11 +3,11 @@ package com.simple.enums; public enum EnumAgeInfo { FIRST_SLOT(1,0,18,"18岁以下"), SECOND_SLOT(2,18,24,"18岁-24岁"), - THIRD_SLOT(3,18,24,"18岁-24岁"), - FOURTH_SLOT(4,18,24,"18岁-24岁"), - FIFTH_SLOT(5,18,24,"18岁-24岁"), - SIXTH_SLOT(6,18,24,"18岁-24岁"), - SEVENTH_SLOT(7,18,24,"18岁-24岁") + THIRD_SLOT(3,18,24,"25岁-34岁"), + FOURTH_SLOT(4,18,24,"35岁-44岁"), + FIFTH_SLOT(5,18,24,"45岁-54岁"), + SIXTH_SLOT(6,18,24,"55岁-60岁"), + SEVENTH_SLOT(7,18,24,"60岁以上") ; private EnumAgeInfo(Integer sortNum,Integer start,Integer end,String desc) { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCUserMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCUserMapper.java index f370d5697..222053d6e 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCUserMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCUserMapper.java @@ -1,8 +1,9 @@ package com.simple.mapper; -import java.util.*; +import java.util.List; + import com.simple.common.CommonMapper; -import org.apache.ibatis.annotations.Param; +import com.simple.domain.dto.WxCuerBasicInfoDto; import com.simple.domain.po.WxCUser; public interface WxCUserMapper extends CommonMapper { @@ -13,4 +14,6 @@ public interface WxCUserMapper extends CommonMapper { WxCUser findByOpenId(WxCUser record); WxCUser findByToken(String token); + + long findCountBySex(WxCuerBasicInfoDto dto); } diff --git a/mallinkService/src/main/java/com/simple/service/WxCUserService.java b/mallinkService/src/main/java/com/simple/service/WxCUserService.java index dcb7a6d11..1dcb1e883 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCUserService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCUserService.java @@ -1,8 +1,7 @@ package com.simple.service; -import java.util.*; - import com.github.pagehelper.PageInfo; +import com.simple.domain.dto.WxCuerBasicInfoDto; import com.simple.domain.po.WxCUser; public interface WxCUserService { @@ -55,5 +54,10 @@ public interface WxCUserService { */ void deleteById(Long id); - + /** + * 根据性别统计数量 + * @param dto + * @return + */ + long findCountBySex(WxCuerBasicInfoDto dto); } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCUserBasicInfoServiceImpl.java index 2f8936f2c..6dac1344d 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCUserBasicInfoServiceImpl.java @@ -1,15 +1,15 @@ package com.simple.service.impl; -import java.util.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.simple.common.IdWorker; import com.simple.domain.dto.WxCuerBasicInfoDto; import com.simple.domain.po.WxCUserBasicInfo; import com.simple.mapper.WxCUserBasicInfoMapper; import com.simple.service.WxCUserBasicInfoService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.simple.common.IdWorker; @Service public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { @@ -72,8 +72,8 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { @Override public long findCountByAge(WxCuerBasicInfoDto dto) { - // TODO Auto-generated method stub - return 0; + + return wxCUserBasicInfoMapper.findCountByAge(dto); } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCUserServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCUserServiceImpl.java index 6ada899ac..e1dbc5676 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCUserServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCUserServiceImpl.java @@ -3,6 +3,7 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.simple.domain.dto.WxCuerBasicInfoDto; import com.simple.domain.po.WxCUser; import com.simple.mapper.WxCUserMapper; import com.simple.service.WxCUserService; @@ -60,6 +61,12 @@ public class WxCUserServiceImpl implements WxCUserService { public void deleteById(Long id) { wxCUserMapper.deleteByPrimaryKey(id); } + + @Override + public long findCountBySex(WxCuerBasicInfoDto dto) { + + return wxCUserMapper.findCountBySex(dto); + } } diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index 67c17a31e..f127b6edf 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -141,7 +141,7 @@ - select count(id) from wx_c_user_basic_info where sex =#{sex} and create_date >= #{startTime} @@ -152,10 +152,14 @@ - + select count(id) from wx_c_user_basic_info where 1=1 + + and birthdate >= #{startTime} + + + and birthdate <= #{endTime} + diff --git a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml index 9d9ae3fc5..c247c6fe4 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml @@ -183,4 +183,14 @@ select * from wx_c_user where `token` = #{token} + + From 01c793483a5983f89fc54e85826318e783610c39 Mon Sep 17 00:00:00 2001 From: "jinguo24@163.com" Date: Sun, 26 Aug 2018 14:56:05 +0800 Subject: [PATCH 10/64] =?UTF-8?q?[=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8][?= =?UTF-8?q?=E6=96=B0=E5=A2=9E]=E8=BF=94=E5=9B=9E=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/simple/controller/HomeController.java | 2 +- .../controller/MallUserInfoController.java | 9 ++++-- .../WxCUserBasicInfoController.java | 5 ++- .../com/simple/domain/po/MallUserInfo.java | 32 ++++++++++++++++--- .../resources/mapper/MallUserInfoMapper.xml | 8 ++++- 5 files changed, 47 insertions(+), 9 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java b/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java index 121052a49..5639ede1e 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java @@ -72,7 +72,7 @@ public class HomeController { if(page.getSize()>0) { Long roleId = page.getList().get(0).getRoleId(); MallRolePermission p = new MallRolePermission(); - p.setRoleId(p.getRoleId()); + p.setRoleId(roleId); p.setTenantId(info.getTenantId()); PageInfo listAsPage = mallRolePermissionService.listAsPage(p, 1, 100); String menus = ""; diff --git a/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java b/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java index c8d354e52..7ecc627d0 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java @@ -14,8 +14,10 @@ import org.springframework.web.bind.annotation.RestController; import com.github.pagehelper.PageInfo; import com.simple.common.ResultData; +import com.simple.domain.po.MallRole; import com.simple.domain.po.MallUserInfo; import com.simple.domain.po.MallUserRole; +import com.simple.service.MallRoleService; import com.simple.service.MallUserInfoService; import com.simple.service.MallUserRoleService; import com.simple.shiro.PasswordHelper; @@ -38,6 +40,9 @@ public class MallUserInfoController { @Autowired MallUserRoleService userRoleService; + + @Autowired + MallRoleService mallRoleService; @ApiOperation(value = "用户分页接口", response = String.class) @GetMapping("lists") @@ -48,11 +53,11 @@ public class MallUserInfoController { r.setUid(u.getId()); PageInfo ur = userRoleService.listAsPage(r, 1, 1); if(ur.getSize()>0) { - u.setRoleId(ur.getList().get(0).getRoleId()); + MallRole role = mallRoleService.getById(ur.getList().get(0).getRoleId()); + u.setRoleName(role.getName()); } u.setPassword(null);//不返回密码 } - return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java index 645ad14e3..eed3b4a2e 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java @@ -226,8 +226,10 @@ public class WxCUserBasicInfoController extends BaseController @ApiOperation("查询会员年龄结构") @GetMapping("/findUserAgeStructure") public ResultData findUserAgeStructure() { - Calendar c = Calendar.getInstance(); + long all =wxCUserBasicInfoService.findCountByAge(new WxCuerBasicInfoDto()); + List vos = new ArrayList<>(); + Calendar c = Calendar.getInstance(); for(EnumAgeInfo a:EnumAgeInfo.values()) { c.clear(); c.setTime(new Date()); @@ -235,6 +237,7 @@ public class WxCUserBasicInfoController extends BaseController c.set(Calendar.MINUTE,0); c.set(Calendar.SECOND,0); long count = getCountByAge(a, c); + vos.add(getVo(count, all, a.getDesc())); } diff --git a/mallinkService/src/main/java/com/simple/domain/po/MallUserInfo.java b/mallinkService/src/main/java/com/simple/domain/po/MallUserInfo.java index 9cf5b37cd..dd3d26f4d 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/MallUserInfo.java +++ b/mallinkService/src/main/java/com/simple/domain/po/MallUserInfo.java @@ -65,8 +65,14 @@ public class MallUserInfo implements Serializable { /*0 不是超管 1是超管**/ @io.swagger.annotations.ApiModelProperty(value="0 不是超管 1是超管",name="isAdmin") private Integer isAdmin; + @io.swagger.annotations.ApiModelProperty(value="昵称",name="nickName") + private String nickName; + @Transient private Long roleId; + + @Transient + private String roleName; //该用户所有的角色 @Transient private List role; @@ -85,12 +91,12 @@ public class MallUserInfo implements Serializable { this.menus = menus; } - public Long getRoleId() { - return roleId; + public String getRoleName() { + return roleName; } - public void setRoleId(Long roleId) { - this.roleId = roleId; + public void setRoleName(String roleName) { + this.roleName = roleName; } public String getTenantId() { @@ -157,6 +163,24 @@ public class MallUserInfo implements Serializable { this.permission = permission; } + public String getNickName() { + return nickName; + } + + public void setNickName(String nickName) { + this.nickName = nickName; + } + + public Long getRoleId() { + return roleId; + } + + public void setRoleId(Long roleId) { + this.roleId = roleId; + } + + + public static enum Field diff --git a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml index 6589b4083..8b52d214c 100644 --- a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml @@ -14,7 +14,7 @@ - `id`,`tenant_id`,`username`,`name`,`password`,`create_time`,`last_login_time`,`status`,`is_admin` + `id`,`tenant_id`,`username`,`name`,`password`,`create_time`,`last_login_time`,`status`,`is_admin`,`nick_name` @@ -33,6 +33,11 @@ and `username` like concat('%', #{username},'%') + + + + and `nick_name` like concat('%', #{nickName},'%') + @@ -64,6 +69,7 @@ and `is_admin` = #{isAdmin} + and id in From a27020239913b71810aa56be033e3a4aee8e09e0 Mon Sep 17 00:00:00 2001 From: masterspirit Date: Sat, 25 Aug 2018 17:51:34 +0800 Subject: [PATCH 11/64] =?UTF-8?q?[=E5=8F=91=E5=88=B8Log][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]=20=E5=88=B8id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/simple/service/impl/WxCouponActionLogServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponActionLogServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponActionLogServiceImpl.java index 74a03e6a6..e4f7baa11 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponActionLogServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponActionLogServiceImpl.java @@ -48,6 +48,7 @@ public class WxCouponActionLogServiceImpl implements WxCouponActionLogService { public void addOne(String tenantId, Long couponId, Long coupon_order_id, int channelType, Long channelId) { WxCouponActionLog actionLog = new WxCouponActionLog(); actionLog.setTenantId(tenantId); + actionLog.setCouponId(couponId); actionLog.setChannelId(channelId); actionLog.setCouponOrderId(coupon_order_id); actionLog.setChannelType(channelType); From 783e32c8ef8c4908a1f66d36df7beb5246ca6747 Mon Sep 17 00:00:00 2001 From: hupeng Date: Sun, 26 Aug 2018 14:58:03 +0800 Subject: [PATCH 12/64] =?UTF-8?q?[CB=E7=AB=AF][=E4=BF=AE=E6=94=B9]:B?= =?UTF-8?q?=E7=AB=AFC=E7=AB=AF=E5=88=B8=E5=88=97=E8=A1=A8=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxCouponOrderMapper.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 57556b533..35a7b1e9d 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -147,6 +147,7 @@ AND co.create_date < #{endDate,jdbcType=TIMESTAMP} AND co.coupon_order_status = '0' + order by co.create_date desc @@ -165,6 +166,7 @@ AND co.update_date < #{endDate,jdbcType=TIMESTAMP} AND co.coupon_order_status = '1' + order by co.update_date desc @@ -272,6 +274,7 @@ AND c.coupon_order_status = #{status} + order by c.create_date desc - select count(id) from wx_c_user_basic_info where 1=1 + select count(id) from wx_c_user_basic_info where birthdate != null - and birthdate >= #{startTime} + and create_date >= #{startTime} - and birthdate <= #{endTime} + and create_date <= #{endTime} + + + + and birthdate >= #{birthStartTime} + + + and birthdate <= #{birthEndTime} From 2c60307bd418ecd0c9e22c9cf27ddb322f048f6f Mon Sep 17 00:00:00 2001 From: "jinguo24@163.com" Date: Sun, 26 Aug 2018 15:22:50 +0800 Subject: [PATCH 14/64] =?UTF-8?q?[=E8=B4=A6=E5=8F=B7=E7=AE=A1=E7=90=86][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml index 8b52d214c..91e806c57 100644 --- a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml @@ -11,6 +11,7 @@ + From 427ad385d21f148eb96bff3d26e1c73059ca8168 Mon Sep 17 00:00:00 2001 From: "jinguo24@163.com" Date: Sun, 26 Aug 2018 15:22:50 +0800 Subject: [PATCH 15/64] =?UTF-8?q?[=E8=B4=A6=E5=8F=B7=E7=AE=A1=E7=90=86][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml index 91e806c57..b1664b6ac 100644 --- a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml @@ -36,7 +36,7 @@ - + and `nick_name` like concat('%', #{nickName},'%') From 4efa02b5778bca5c087e9a4146fb897e6cf591d1 Mon Sep 17 00:00:00 2001 From: "jinguo24@163.com" Date: Sun, 26 Aug 2018 15:34:30 +0800 Subject: [PATCH 16/64] =?UTF-8?q?[=E4=BC=9A=E5=91=98=E7=BB=93=E6=9E=84][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]mapper=20=E4=BF=AE=E6=94=B9=E4=BA=86?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxCUserBasicInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index b0a3ba3ed..2ecd237ac 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -153,7 +153,7 @@ select from wx_coupon_channel + + select from wx_mall_config + + + + + + + + + From 52046da5dc9026019fbf878f9856d9b7733a5ac4 Mon Sep 17 00:00:00 2001 From: masterspirit Date: Sun, 26 Aug 2018 17:13:02 +0800 Subject: [PATCH 26/64] =?UTF-8?q?[=E4=BF=AE=E6=94=B9=E5=88=B8=E7=8A=B6?= =?UTF-8?q?=E6=80=81][=E4=BF=AE=E6=94=B9]=20=E5=88=B8=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/simple/controller/WxCouponController.java | 12 ++++++++---- .../java/com/simple/domain/po/WxCouponChannel.java | 10 ++++++++++ .../service/impl/WxCouponChannelServiceImpl.java | 1 + .../main/resources/mapper/WxCouponChannelMapper.xml | 12 ++++++++++++ 4 files changed, 31 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java index 7df4bbc68..a96ce4631 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java @@ -66,17 +66,21 @@ public class WxCouponController extends BaseController List ids = wxCouponList.stream().map(p->p.getId()).collect(Collectors.toList()); WxCouponChannel wxCouponChannel = new WxCouponChannel(); wxCouponChannel.setTenantId(getTenantId()); - wxCouponChannel.setIds(ids); + wxCouponChannel.setCouponIds(ids); //上架状态 List list = wxCouponChannelService.listAsPage(wxCouponChannel,1,5).getList(); if(!list.isEmpty()){ Map> groupBy = list.stream().collect(Collectors.groupingBy(WxCouponChannel::getCouponId)); for (WxCoupon temp:wxCouponList) { - List channels=new ArrayList<>(); + List channels=new ArrayList<>(); if(groupBy.get(temp.getId())!=null){ - String sss = JSON.toJSONString(groupBy.get(temp.getId())); - temp.setChannels(sss); + for (WxCouponChannel tempchannel:groupBy.get(temp.getId())) { + channels.add(tempchannel.getTargetAd()); + } + } + String sss = JSON.toJSONString(channels); + temp.setChannels(sss); } } diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCouponChannel.java b/mallinkService/src/main/java/com/simple/domain/po/WxCouponChannel.java index 7c2152792..e18bb0fe5 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCouponChannel.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCouponChannel.java @@ -17,6 +17,9 @@ public class WxCouponChannel implements Serializable { @Transient protected List ids; + @Transient + protected List couponIds; + @Transient protected String sortColumns; @@ -151,6 +154,13 @@ public class WxCouponChannel implements Serializable { public void setUpdateDate(Date _updateDate) { updateDate = _updateDate; } + public List getCouponIds() { + return couponIds; + } + + public void setCouponIds(List couponIds) { + this.couponIds = couponIds; + } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponChannelServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponChannelServiceImpl.java index 270f60cb4..24cd6c59a 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponChannelServiceImpl.java @@ -82,6 +82,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { wxCouponService.saveOrUpdate(wxCoupon); } WxCouponChannel wxCouponChannel = new WxCouponChannel(); + wxCouponChannel.setStatus(0); wxCouponChannel.setBeginTime(beginTime); wxCouponChannel.setEndTime(endTime); wxCouponChannel.setCouponId(couponid); diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index 16800c95f..2ce097744 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -95,6 +95,12 @@ #{idItem} + + and coupon_id in + + #{couponIdsItem} + + order by ${sortColumns} @@ -102,6 +108,12 @@ select from wx_coupon_channel + + + - select from wx_coupon c,wx_merchant m - where c.merchant_id = m.id - and c.status = '1' - and send_end_date >= NOW() - and send_start_date <= NOW() - - - and c.tenant_id = #{tenantId} - - - and c.business like concat('%', #{business},'%') - - - and c.type = #{type} - - - + + select from wx_coupon_channel cc, - wx_coupon c,wx_merchant m, - wx_shop s,wx_merchant_shop ms, - wx_mall_building mb, - wx_mall_floor mf + wx_coupon c,wx_merchant m + left join wx_merchant_shop ms on ms.merchant_id = m.id + left join wx_shop s on ms.shop_id = s.id + left join wx_mall_building mb on s.building = mb.id + left join wx_mall_floor mf on s.floor = mf.id where c.merchant_id = m.id + and cc.coupon_id = c.id and c.id = #{couponId} - and cc.coupon_id = #{couponId} and c.tenant_id = #{tenantId} @@ -533,10 +534,6 @@ and cc.target_ad = #{targetAd} - and ms.merchant_id = m.id - and ms.shop_id = s.id - and s.building = mb.id - and s.floor = mf.id diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index ce756bd11..e86ec8828 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -347,11 +347,13 @@ From 878bb7c9e8156f4c90263293bb426776eac456c1 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Mon, 27 Aug 2018 15:52:09 +0800 Subject: [PATCH 49/64] =?UTF-8?q?[=E6=94=AF=E4=BB=98=E5=88=86=E8=B4=A6?= =?UTF-8?q?=E5=9B=9E=E8=B0=83=E6=8E=A5=E5=8F=A3][=E6=96=B0=E5=A2=9E]:?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=9B=9E=E8=B0=83=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/controller/WxPayController.java | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxPayController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxPayController.java index af8f9e8d7..b3ed1663a 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxPayController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxPayController.java @@ -5,6 +5,7 @@ import com.simple.exception.BizMessageException; import com.simple.exception.MallinkException; import com.simple.pay.WxPayment; import com.simple.service.WxPayOrderService; +import com.simple.service.WxProfitSharingOrderService; import com.simple.service.WxRefundOrderService; import com.simple.utils.XmlUtil; import org.apache.commons.io.IOUtils; @@ -31,6 +32,9 @@ public class WxPayController extends BaseController { @Autowired private WxRefundOrderService wxRefundOrderService; + @Autowired + private WxProfitSharingOrderService wxProfitSharingOrderService; + /** * * @return 接收微信异步通知 @@ -117,5 +121,42 @@ public class WxPayController extends BaseController { return XmlUtil.getRequestXml(resultMap); } } + + /** + * + * @return 接收微信分账异步通知 + * @throws Exception 可能产生的任何异常 + */ + @RequestMapping(value = "/sharing") + public String __shareNotify(HttpServletRequest request) throws Exception { + Map paramMap = null; + String response; + try { + String xml = IOUtils.toString(request.getInputStream(), Charset.forName("UTF-8")); + paramMap = WxPayment.xmlToMap(xml); + logger.info("share wxpay, notify, param: " + paramMap.toString() ); + response = wxPayOrderService.notify(paramMap, EnumPayWay.PAY_WAY_WEAPP); + logger.info("share wxpay, notify success, req : " + paramMap.toString() + ", resp: " + response.toString()); + return response; + } catch (BizMessageException e) { + logger.error("share wxpay, notify error, req: " + paramMap.toString() + ", e:" + e.getLocalizedMessage()); + SortedMap resultMap = new TreeMap(); + resultMap.put("return_code", "FAIL"); + resultMap.put("return_msg", e.getMessage()); + return XmlUtil.getRequestXml(resultMap); + } catch (MallinkException e) { + logger.error("refund wxpay, notify error, req: " + paramMap.toString() + ", e:" +e.getLocalizedMessage()); + SortedMap resultMap = new TreeMap(); + resultMap.put("return_code", "FAIL"); + resultMap.put("return_msg", e.getMessage()); + return XmlUtil.getRequestXml(resultMap); + } catch (Exception e) { + logger.error("refund wxpay, order create error, req: " + paramMap.toString() + ", e: " + e.getMessage()); + SortedMap resultMap = new TreeMap(); + resultMap.put("return_code", "FAIL"); + resultMap.put("return_msg", e.getMessage()); + return XmlUtil.getRequestXml(resultMap); + } + } } From c9ab2045dc366a49cdaf1f167bcd758dd2c6e541 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Mon, 27 Aug 2018 15:59:40 +0800 Subject: [PATCH 50/64] =?UTF-8?q?[B=E7=AB=AF=E9=AA=8C=E8=AF=81=E7=A0=81?= =?UTF-8?q?=E5=8F=91=E6=94=BE][=E4=BF=AE=E6=94=B9]:=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81crash=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxMsgValidationcodeController.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxMsgValidationcodeController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMsgValidationcodeController.java index 91372708c..5cc042ca9 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxMsgValidationcodeController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxMsgValidationcodeController.java @@ -36,18 +36,17 @@ public class WxMsgValidationcodeController extends BaseController { @GetMapping("sendvalidationcode") @ApiImplicitParams({ - @ApiImplicitParam(name = "tenantId", value = "租户ID", dataType = "String", paramType = "query"), @ApiImplicitParam(name = "phone", value = "手机号", dataType = "String", paramType = "query", required = true), @ApiImplicitParam(name = "type", value = "场景", dataType = "Integer", paramType = "query", required = true), @ApiImplicitParam(name = "appid", value = "appid", dataType = "String", paramType = "query", required = true)}) - public ResultData sendvalidationcode(String tenantId, String phone, Integer type, String appid) { + public ResultData sendvalidationcode(String phone, Integer type, String appid) { - WxMerchantBUser user = new WxMerchantBUser(); - user.setAppId(appid); - user.setPhone(phone); + WxMerchantBUser userQ = new WxMerchantBUser(); + userQ.setAppId(appid); + userQ.setPhone(phone); - WxMerchantBUser buser=wxMerchantBUserService.getBUserByAppId(user); - if (buser==null) { + WxMerchantBUser user=wxMerchantBUserService.getBUserByAppId(userQ); + if (user==null) { logger.error("B端用户不存在, phone: " + phone); return new ResultData(ErrorCode.USER_IS_EMPTY); } @@ -65,7 +64,7 @@ public class WxMsgValidationcodeController extends BaseController { } WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); - wxMsgValidationcode.setTenantId(tenantId); + wxMsgValidationcode.setTenantId(user.getTenantId()); wxMsgValidationcode.setPhone(phone); wxMsgValidationcode.setType(type); wxMsgValidationcode.setAppid(appid); From fbf7aa69f52478323ddc0fdeefaec44e15c1a04a Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 27 Aug 2018 12:54:57 +0800 Subject: [PATCH 51/64] =?UTF-8?q?[=E6=95=B0=E6=8D=AE=E5=A1=94=E5=8F=B0][?= =?UTF-8?q?=E8=BD=A6=E6=B5=81=E6=95=B0=E6=8D=AE]:=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DataTowerController.java | 11 ++ .../com/simple/mapper/WxCarCmdLogMapper.java | 13 +- .../com/simple/service/DataTowerService.java | 2 + .../service/impl/DataTowerServiceImpl.java | 38 +++++- .../resources/mapper/WxCarCmdLogMapper.xml | 117 ++++++++++-------- 5 files changed, 115 insertions(+), 66 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/DataTowerController.java b/mallinkAdmin/src/main/java/com/simple/controller/DataTowerController.java index 22ef453ff..281a96560 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/DataTowerController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/DataTowerController.java @@ -34,4 +34,15 @@ public class DataTowerController extends BaseController { } + @ApiOperation("查询车流") + @PostMapping("/queryCar") + public ResultData queryCar() { + + Map data=dataTowerService.queryCar(getTenantId()); + + return new ResultData(data); + } + + + } diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCarCmdLogMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCarCmdLogMapper.java index e8017220f..d3ecc7564 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCarCmdLogMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCarCmdLogMapper.java @@ -1,17 +1,16 @@ package com.simple.mapper; -import java.util.*; import com.simple.common.CommonMapper; -import org.apache.ibatis.annotations.Param; import com.simple.domain.po.WxCarCmdLog; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + public interface WxCarCmdLogMapper extends CommonMapper { List findList(WxCarCmdLog wxCarCmdLog); - - - - - + List> queryHistory(HashMap params); + } diff --git a/mallinkService/src/main/java/com/simple/service/DataTowerService.java b/mallinkService/src/main/java/com/simple/service/DataTowerService.java index e4c992528..0f2d231b5 100644 --- a/mallinkService/src/main/java/com/simple/service/DataTowerService.java +++ b/mallinkService/src/main/java/com/simple/service/DataTowerService.java @@ -7,4 +7,6 @@ public interface DataTowerService { Map queryRunning(String tenantId); + Map queryCar(String tenantId); + } diff --git a/mallinkService/src/main/java/com/simple/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/DataTowerServiceImpl.java index bc1a00f7a..fc5a3cbda 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/DataTowerServiceImpl.java @@ -1,15 +1,15 @@ package com.simple.service.impl; +import com.simple.common.ErrorCode; import com.simple.domain.po.WxMerchant; import com.simple.domain.po.WxMerchantTradeDaily; import com.simple.domain.po.WxShop; -import com.simple.mapper.WxDateAmountRecordMapper; -import com.simple.mapper.WxMerchantMapper; -import com.simple.mapper.WxMerchantTradeDailyMapper; -import com.simple.mapper.WxShopMapper; +import com.simple.enums.EnumCarCmd; +import com.simple.mapper.*; import com.simple.service.DataTowerService; import com.simple.utils.DateUtils; import org.apache.log4j.Logger; +import org.apache.shiro.crypto.hash.Hash; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -35,6 +35,8 @@ public class DataTowerServiceImpl implements DataTowerService { @Autowired WxDateAmountRecordMapper wxDateAmountRecordMapper; + @Autowired + WxCarCmdLogMapper wxCarCmdLogMapper; @Override public Map queryRunning(String tenantId) { @@ -115,4 +117,32 @@ public class DataTowerServiceImpl implements DataTowerService { return datamap; } + + @Override + public Map queryCar(String tenantId) { + HashMap params = new HashMap<>(); + params.put("tenantId",tenantId); + params.put("cmdType",EnumCarCmd.CAR_ETCP_CALLBACK_PARK_OUT.getCode()); + String startdate = DateUtils.getTimeBefore(7, new Date()); + String enddate = DateUtils.getSystemTime("yyyy-MM-dd"); + params.put("startdate",startdate); + params.put("enddate",enddate); + + List> historylist=wxCarCmdLogMapper.queryHistory(params); + Map collect = historylist.stream().collect(Collectors.toMap(m -> { + return m.get("create_date"); + }, m -> { + return m.get("carcount"); + })); + + TreeMap historymap = new TreeMap<>(); + historymap.putAll(collect); + + Map datamap = new HashMap<>(); + datamap.put("history",historymap); + + return datamap; + } + + } diff --git a/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml index 12e02bc44..21d690409 100644 --- a/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml @@ -2,73 +2,80 @@ - - - - - - - + + + + + + + `id`,`tenant_id`,`vendor_type`,`cmd_type`,`create_date`,`update_date`,`cmd_json` - + - where 1 = 1 - - - and `id` = #{id} - - - - - and `tenant_id` like concat('%', #{tenantId},'%') - - - - - and `vendor_type` = #{vendorType} - - - - - and `cmd_type` = #{cmdType} - - - - - and `create_date` = #{createDate} - - - - - and `update_date` = #{updateDate} - - - - - and `cmd_json` like concat('%', #{cmdJson},'%') - - + where 1 = 1 + + + and `id` = #{id} + + + + + and `tenant_id` like concat('%', #{tenantId},'%') + + + + + and `vendor_type` = #{vendorType} + + + + + and `cmd_type` = #{cmdType} + + + + + and `create_date` = #{createDate} + + + + + and `update_date` = #{updateDate} + + + + + and `cmd_json` like concat('%', #{cmdJson},'%') + + - and id in + and id in - #{idItem} + #{idItem} - - order by ${sortColumns} + + order by ${sortColumns} - - - - - + + + From 9a2f356ae67e8ec0c7495ba0931e8aad14b1f435 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 27 Aug 2018 16:41:35 +0800 Subject: [PATCH 52/64] =?UTF-8?q?[=E5=95=86=E9=93=BA][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=A6=81=E5=88=86=E9=A1=B5=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/simple/controller/WxShopController.java | 1 + .../main/java/com/simple/service/impl/WxShopServiceImpl.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java index aba2ccfc8..ab6475d73 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java @@ -31,6 +31,7 @@ public class WxShopController extends BaseController @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) public ResultData list(@ModelAttribute WxShop wxShop,Integer pageNum, Integer pageSize) { if (null == wxShop) wxShop = new WxShop(); + wxShop.setTenantId(getTenantId()); final PageInfo> page = wxShopService.listMapAsPage(wxShop, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxShopServiceImpl.java index e8742fe88..269d1e30e 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxShopServiceImpl.java @@ -24,9 +24,10 @@ public class WxShopServiceImpl implements WxShopService { @Override public PageInfo> listMapAsPage(WxShop record, Integer pageIndex, Integer pageSize) { - List> shops = wxShopMapper.findListMap(record); PageHelper.startPage(pageIndex, pageSize); + List> shops = wxShopMapper.findListMap(record); PageInfo> pageInfo = new PageInfo<>(shops); + return pageInfo; } From b68f050349c35490b170a8f5e39af6dbba3ca04d Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 27 Aug 2018 16:42:11 +0800 Subject: [PATCH 53/64] =?UTF-8?q?[=E6=95=B0=E6=8D=AE=E5=A1=94=E5=8F=B0][?= =?UTF-8?q?=E8=BD=A6=E6=B5=81=E6=95=B0=E6=8D=AE]:=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DataTowerServiceImpl.java | 41 +++++++++++++++++-- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/DataTowerServiceImpl.java index fc5a3cbda..f7566a91c 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/DataTowerServiceImpl.java @@ -124,23 +124,58 @@ public class DataTowerServiceImpl implements DataTowerService { params.put("tenantId",tenantId); params.put("cmdType",EnumCarCmd.CAR_ETCP_CALLBACK_PARK_OUT.getCode()); String startdate = DateUtils.getTimeBefore(7, new Date()); - String enddate = DateUtils.getSystemTime("yyyy-MM-dd"); - params.put("startdate",startdate); - params.put("enddate",enddate); + String systemTime = DateUtils.getSystemTime("yyyy-MM-dd"); + + List tjTimeList = DateUtils.getTjTimeList(startdate, systemTime, "0"); + + params.put("startdate",startdate+" 00:00:00"); + params.put("enddate",systemTime+" 23:59:59"); List> historylist=wxCarCmdLogMapper.queryHistory(params); + Map collect = historylist.stream().collect(Collectors.toMap(m -> { return m.get("create_date"); }, m -> { return m.get("carcount"); })); + for(String date:tjTimeList){ + Object o = collect.get(date); + if(o==null){ + collect.put(date,0l); + } + } + TreeMap historymap = new TreeMap<>(); historymap.putAll(collect); Map datamap = new HashMap<>(); datamap.put("history",historymap); + //今日车流量 + long todaycar = (long) collect.get(systemTime); + datamap.put("todaycar",todaycar); + //环比 + long yesterdaycar = (long) collect.get(tjTimeList.get(8 - 2)); + if(yesterdaycar>0){ + double hbd = (double) (todaycar - yesterdaycar) / yesterdaycar *100; + double hb = new BigDecimal(hbd).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + datamap.put("hb",hb); + }else{ + datamap.put("hb","--"); + } + + //上周同期 + long last = (long) collect.get(tjTimeList.get(0)); + if(last>0){ + double lasthbd = (double) (todaycar - last) / last *100; + double lasthb = new BigDecimal(lasthbd).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + datamap.put("lasthb",lasthb); + }else{ + datamap.put("lasthb","--"); + } + + return datamap; } From 05dc0a11b395554ec3cfd9e37166677d2f685577 Mon Sep 17 00:00:00 2001 From: hupeng Date: Mon, 27 Aug 2018 17:05:13 +0800 Subject: [PATCH 54/64] =?UTF-8?q?[B=E7=AB=AF][=E5=88=A0=E9=99=A4]:?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=88=91=E7=94=A8=E7=9A=84=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/controller/WxOrderController.java | 117 ------------------ .../java/com/simple/domain/vo/OrderVo.java | 96 -------------- .../java/com/simple/mapper/WxOrderMapper.java | 5 - .../com/simple/service/WxOrderService.java | 17 --- .../service/impl/WxOrderServiceImpl.java | 10 -- .../main/resources/mapper/WxOrderMapper.xml | 80 ------------ 6 files changed, 325 deletions(-) delete mode 100644 mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java delete mode 100644 mallinkService/src/main/java/com/simple/domain/vo/OrderVo.java diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java b/mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java deleted file mode 100644 index bc2890051..000000000 --- a/mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.simple.controller; - -import com.simple.common.ErrorCode; -import com.simple.domain.po.WxMerchantBUser; -import com.simple.domain.vo.OrderVo; -import com.simple.enums.EnumOrderStatus; -import io.swagger.annotations.Api; -import io.swagger.models.auth.In; -import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.*; - -import com.github.pagehelper.PageInfo; -import com.simple.common.Result; -import com.simple.common.ResultData; - -import com.simple.domain.po.WxOrder; -import com.simple.service.WxOrderService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -import java.util.Map; - -@RestController -@RequestMapping("/order") -@Api(description="订单相关接口") -public class WxOrderController extends BaseController { - private Logger logger = Logger.getLogger(WxOrderController.class); - - @Autowired - private WxOrderService wxOrderService; - - @GetMapping("list") - @ApiOperation(value = "券查询接口", notes="") - @ApiImplicitParams({ - @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), - @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), - @ApiImplicitParam(name = "orderStatus", value = "订单状态:-1全部;0-已下单/待付款;1-已支付;2-已取消(限定时间内未付款);3-未退款/待退款;4-已退款;5-退款失败", required = false, dataType = "Integer"), - @ApiImplicitParam(name = "couponStatus", value = "券状态:-1全部;3:已领取/已购买/未核销/未使用,4:已核销/已使用,5:已过期,6:已退券", required = false, dataType = "Integer") - }) - public ResultData list(Integer orderStatus, Integer couponStatus, Integer pageNum, Integer pageSize) { - WxMerchantBUser user = getUser(); - OrderVo orderVo = new OrderVo(); - orderVo.setbUserId(user.getId()); - if (orderStatus != -1) - orderVo.setOrderStatus(orderStatus); - if (couponStatus != -1) - orderVo.setCouponStatus(couponStatus); - final PageInfo> page = wxOrderService.bQueryListMap(orderVo, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation(value = "订单详情", notes = "{\"couponOrderId\":\"String\",\"orderId\":\"String\",\"couponId\":\"String\"}") - @GetMapping("detail") - public ResultData orderDetail(@RequestBody Map paramMap) { - //Assert.notNull(wxOrders.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - String couponOrderIdStr = paramMap.get("couponOrderId"); - String orderIdStr = paramMap.get("orderId"); - String couponIdStr = paramMap.get("couponId"); - if (StringUtils.isBlank(couponOrderIdStr)) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponOrderId不能为空"); - } - if (StringUtils.isBlank(orderIdStr)) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "orderId不能为空"); - } - if (StringUtils.isBlank(couponIdStr)) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponId不能为空"); - } - Long couponOrderId = 0L, orderId = 0L, couponId = 0L; - try { - couponOrderId = Long.valueOf(couponOrderIdStr); - orderId = Long.valueOf(orderIdStr); - couponId = Long.valueOf(couponIdStr); - } catch (NumberFormatException e) { - logger.error("couponOrderId " + couponOrderIdStr + ", e:" + e.getMessage()); - } - WxMerchantBUser user = getUser(); - OrderVo orderVo = new OrderVo(); - orderVo.setbUserId(user.getId()); - orderVo.setOrderId(orderId); - orderVo.setCouponId(couponId); - Map map = wxOrderService.queryObject(orderVo); - return new ResultData(map); - } - - @ApiOperation(value = "手工退款", notes = "{\"orderId\":\"string\"}") - @PostMapping("refund") - public ResultData expiringOrder(@RequestBody Map paramMap) { - //Assert.notNull(wxOrders.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - String orderIdStr = paramMap.get("orderId"); - if (StringUtils.isBlank(orderIdStr)) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "orderId不能为空"); - } - Long orderId = 0L; - try { - orderId = Long.valueOf(orderIdStr); - } catch (NumberFormatException e) { - logger.error("orderId " + orderIdStr + ", e:" + e.getMessage()); - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "订单ID转换异常"); - } - try { - WxOrder order = wxOrderService.getById(orderId); - if (order != null) { - wxOrderService.updateOrderStatus(order, EnumOrderStatus.ORDER_STATUS_PENDING_REFUND); - } - } catch (Exception e) { - logger.error("orderId " + orderIdStr + ", e:" + e.getMessage()); - } - - return new ResultData(); - } -} diff --git a/mallinkService/src/main/java/com/simple/domain/vo/OrderVo.java b/mallinkService/src/main/java/com/simple/domain/vo/OrderVo.java deleted file mode 100644 index 4ff8f3e6a..000000000 --- a/mallinkService/src/main/java/com/simple/domain/vo/OrderVo.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.simple.domain.vo; - -import java.io.Serializable; - -public class OrderVo implements Serializable { - private static final long serialVersionUID = 1L; - - /*租户ID**/ - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; - /*商户ID**/ - @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") - private Long merchantId; - /*订单ID**/ - @io.swagger.annotations.ApiModelProperty(value="订单ID",name="orderId") - private Long orderId; - /*卡券ID**/ - @io.swagger.annotations.ApiModelProperty(value="卡券ID",name="couponId") - private Long couponId; - /*c端用户id**/ - @io.swagger.annotations.ApiModelProperty(value="c端用户id",name="cUserId") - private Long cUserId; - /*b端用户id**/ - @io.swagger.annotations.ApiModelProperty(value="b端用户id",name="bUserId") - private Long bUserId; - /*订单状态**/ - @io.swagger.annotations.ApiModelProperty(value="订单状态",name="orderStatus") - private Integer orderStatus; - /*券状态**/ - @io.swagger.annotations.ApiModelProperty(value="券状态",name="status") - private Integer couponStatus; - - public String getTenantId() { - return tenantId; - } - - public void setTenantId(String tenantId) { - this.tenantId = tenantId; - } - - public Long getMerchantId() { - return merchantId; - } - - public void setMerchantId(Long merchantId) { - this.merchantId = merchantId; - } - - public Long getOrderId() { - return orderId; - } - - public void setOrderId(Long orderId) { - this.orderId = orderId; - } - - public Long getCouponId() { - return couponId; - } - - public void setCouponId(Long couponId) { - this.couponId = couponId; - } - - public Long getcUserId() { - return cUserId; - } - - public void setcUserId(Long cUserId) { - this.cUserId = cUserId; - } - - public Long getbUserId() { - return bUserId; - } - - public void setbUserId(Long bUserId) { - this.bUserId = bUserId; - } - - public Integer getOrderStatus() { - return orderStatus; - } - - public void setOrderStatus(Integer orderStatus) { - this.orderStatus = orderStatus; - } - - public Integer getCouponStatus() { - return couponStatus; - } - - public void setCouponStatus(Integer couponStatus) { - this.couponStatus = couponStatus; - } -} diff --git a/mallinkService/src/main/java/com/simple/mapper/WxOrderMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxOrderMapper.java index d90112eca..781ac4700 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxOrderMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxOrderMapper.java @@ -3,7 +3,6 @@ package com.simple.mapper; import java.util.*; import com.simple.common.CommonMapper; import com.simple.domain.po.WxCouponOrder; -import com.simple.domain.vo.OrderVo; import org.apache.ibatis.annotations.Param; import com.simple.domain.po.WxOrder; @@ -11,9 +10,5 @@ public interface WxOrderMapper extends CommonMapper { List findList(WxOrder wxOrder); - List> queryListMap(OrderVo orderVo); - - Map queryObject(OrderVo orderVo); - List findListOfUnpaidOrderByDate(Map dateMap); } diff --git a/mallinkService/src/main/java/com/simple/service/WxOrderService.java b/mallinkService/src/main/java/com/simple/service/WxOrderService.java index c0cfa1d22..ee4a228a9 100644 --- a/mallinkService/src/main/java/com/simple/service/WxOrderService.java +++ b/mallinkService/src/main/java/com/simple/service/WxOrderService.java @@ -4,7 +4,6 @@ import java.util.*; import com.github.pagehelper.PageInfo; import com.simple.domain.po.WxCUser; import com.simple.domain.po.WxOrder; -import com.simple.domain.vo.OrderVo; import com.simple.enums.EnumOrderStatus; public interface WxOrderService { @@ -19,22 +18,6 @@ public interface WxOrderService { */ PageInfo listAsPage(WxOrder record, Integer pageIndex, Integer pageSize); - /** - * 根据实体查询分页列表 - * - * @param orderVo - * @param pageIndex - * @param pageSize - * @return - */ - PageInfo> bQueryListMap(OrderVo orderVo, Integer pageIndex, Integer pageSize); - - /** - * 查询券详情 - * @param orderVo - * @return - */ - Map queryObject(OrderVo orderVo); /** * 提交订单 diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java index f0960f805..ce70bed53 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java @@ -8,7 +8,6 @@ import com.simple.domain.po.WxCUser; import com.simple.domain.po.WxCoupon; import com.simple.domain.po.WxCouponOrder; import com.simple.domain.po.WxOrder; -import com.simple.domain.vo.OrderVo; import com.simple.enums.*; import com.simple.exception.MallinkException; import com.simple.mapper.*; @@ -61,15 +60,6 @@ public class WxOrderServiceImpl implements WxOrderService { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxOrderMapper.findList(record)); } - @Override - public PageInfo> bQueryListMap(OrderVo orderVo, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxOrderMapper.queryListMap(orderVo)); - } - - @Override - public Map queryObject(OrderVo orderVo) { - return wxOrderMapper.queryObject(orderVo); - } private int getUserCouponOrderCount(WxCUser user, WxCoupon counpon) { // 用户购买的券包数量 diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index f86f362c2..9d0ee784a 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -109,86 +109,6 @@ - - - - + + + + + From 221735cafedb8b79617371193ab20576c26fd2e7 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 27 Aug 2018 18:16:44 +0800 Subject: [PATCH 58/64] =?UTF-8?q?[=E5=95=86=E6=88=B7=E5=95=86=E9=93=BA][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E6=9F=A5=E8=AF=A2=E5=95=86=E9=93=BA?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/resources/mapper/WxShopMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index 9f2ee3442..3eea87c3a 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -127,7 +127,7 @@ select s.id,s.shop_number shopNumber,s.build_area buildArea, s.img_url imgUrl,s.operation_area operationArea, - s.status,b.building_name buildName,f.floor_name floorName + s.status,b.building_name building,f.floor_name floor from wx_shop s left join wx_mall_building b on s.building=b.id left join wx_mall_floor f on s.floor=f.id From 5a3c76732ca123119a29a6c79e81cb4d6454e549 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Mon, 27 Aug 2018 18:03:47 +0800 Subject: [PATCH 59/64] =?UTF-8?q?[=E8=AE=A2=E5=8D=95=E6=8E=A5=E5=8F=A3][?= =?UTF-8?q?=E6=96=B0=E5=A2=9E]:=E9=A2=91=E9=81=93=E4=B8=8B=E6=9E=B6?= =?UTF-8?q?=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/controller/WxOrderController.java | 61 ++++++++++++++----- .../java/com/simple/common/ErrorCode.java | 1 + .../simple/enums/EnumCouponChannelStatus.java | 38 ++++++++++++ 3 files changed, 86 insertions(+), 14 deletions(-) create mode 100644 mallinkService/src/main/java/com/simple/enums/EnumCouponChannelStatus.java diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxOrderController.java b/mallinkCApi/src/main/java/com/simple/controller/WxOrderController.java index 33ef02b38..dbebdc5ef 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxOrderController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxOrderController.java @@ -2,8 +2,12 @@ package com.simple.controller; import com.simple.common.ErrorCode; import com.simple.domain.po.WxCUser; +import com.simple.domain.po.WxCouponChannel; +import com.simple.enums.EnumCouponChannelStatus; +import com.simple.enums.EnumCouponStatus; import com.simple.enums.EnumOrderStatus; import com.simple.exception.MallinkException; +import com.simple.service.WxCouponChannelService; import io.swagger.annotations.Api; import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; @@ -28,24 +32,40 @@ import java.util.Map; public class WxOrderController extends BaseController { private Logger logger = Logger.getLogger(WxOrderController.class); + @Autowired + private WxCouponChannelService wxCouponChannelService; + @Autowired private WxOrderService wxOrderService; - @ApiOperation(value = "免费领取", notes = "{\"couponId\":\"String\"}") + @ApiOperation(value = "免费领取", notes = "{\"couponChannelId\":\"String\",\"couponId\":\"String\"}") @PostMapping("freeCoupon") public ResultData freeCoupon(@RequestBody Map paramMap) { //Assert.notNull(wxOrders.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + String couponChannelIdStr = paramMap.get("couponChannelId"); String couponIdStr = paramMap.get("couponId"); - if (StringUtils.isBlank(couponIdStr)) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponId不能为空"); + if (StringUtils.isBlank(couponChannelIdStr)) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponChannelId不能为空"); } - Long couponId = 0L; + Long couponChannelId = 0L, couponId = 0L; try { - couponId = Long.valueOf(couponIdStr); + couponChannelId = Long.valueOf(couponChannelIdStr); } catch (NumberFormatException e) { - logger.error("couponId convert error, " + couponIdStr + ", e:" + e.getMessage()); - return new ResultData(ErrorCode.SYS_PARAMETER_CAST_ERROR.getCode(), "couponId: " + couponIdStr + ", e:" + e.getMessage()); + logger.error("couponChannelId convert error, " + couponChannelIdStr + ", e:" + e.getMessage()); + return new ResultData(ErrorCode.SYS_PARAMETER_CAST_ERROR.getCode(), "couponChannelId: " + couponChannelIdStr + ", e:" + e.getMessage()); + } + WxCouponChannel wxCouponChannel = wxCouponChannelService.getById(couponChannelId); + if (wxCouponChannel == null) { + logger.error("couponChannelId convert error, " + couponChannelIdStr); + return new ResultData(ErrorCode.SYS_PARAMETER_CAST_ERROR.getCode(), "找不到发布的频道"); + } + if (wxCouponChannel.getStatus() == EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode()) { + logger.error("此券已下架:" + couponChannelIdStr); + return new ResultData(ErrorCode.COUPON_IS_TAKE_OFF.getCode(), "此券已下架"); + } + if (StringUtils.isBlank(couponIdStr)) { + couponId = wxCouponChannel.getCouponId(); } WxCUser user = getUser(); @@ -64,21 +84,34 @@ public class WxOrderController extends BaseController { } } - @ApiOperation(value = "下订单", notes = "{\"couponId\":\"String\"}") + @ApiOperation(value = "下订单", notes = "{\"couponChannelId\":\"String\",\"couponId\":\"String\"}") @PostMapping("save") public ResultData saveOrder(@RequestBody Map paramMap) { //Assert.notNull(wxOrders.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + String couponChannelIdStr = paramMap.get("couponChannelId"); String couponIdStr = paramMap.get("couponId"); - if (StringUtils.isBlank(couponIdStr)) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponId不能为空"); + if (StringUtils.isBlank(couponChannelIdStr)) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponChannelId不能为空"); } - Long couponId = 0L; + Long couponChannelId = 0L, couponId = 0L; try { - couponId = Long.valueOf(couponIdStr); + couponChannelId = Long.valueOf(couponChannelIdStr); } catch (NumberFormatException e) { - logger.error("couponId convert error, " + couponIdStr + ", e:" + e.getMessage()); - return new ResultData(ErrorCode.SYS_PARAMETER_CAST_ERROR.getCode(), "couponId: " + couponIdStr + ", e:" + e.getMessage()); + logger.error("couponChannelId convert error, " + couponChannelIdStr + ", e:" + e.getMessage()); + return new ResultData(ErrorCode.SYS_PARAMETER_CAST_ERROR.getCode(), "couponChannelId: " + couponChannelIdStr + ", e:" + e.getMessage()); + } + WxCouponChannel wxCouponChannel = wxCouponChannelService.getById(couponChannelId); + if (wxCouponChannel == null) { + logger.error("couponChannelId convert error, " + couponChannelIdStr); + return new ResultData(ErrorCode.SYS_PARAMETER_CAST_ERROR.getCode(), "找不到发布的频道"); + } + if (wxCouponChannel.getStatus() == EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode()) { + logger.error("此券已下架:" + couponChannelIdStr); + return new ResultData(ErrorCode.COUPON_IS_TAKE_OFF.getCode(), "此券已下架"); + } + if (StringUtils.isBlank(couponIdStr)) { + couponId = wxCouponChannel.getCouponId(); } WxCUser user = getUser(); diff --git a/mallinkService/src/main/java/com/simple/common/ErrorCode.java b/mallinkService/src/main/java/com/simple/common/ErrorCode.java index 496f7e1f2..48c82883e 100644 --- a/mallinkService/src/main/java/com/simple/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/simple/common/ErrorCode.java @@ -69,6 +69,7 @@ public enum ErrorCode{ */ COUPON_IS_EMPTY(2020, "券不存在"), COUPON_IS_NOT_FREE(2021, "券不免费"), + COUPON_IS_TAKE_OFF(2022, "此券已下架"), /** * 车流 2040 diff --git a/mallinkService/src/main/java/com/simple/enums/EnumCouponChannelStatus.java b/mallinkService/src/main/java/com/simple/enums/EnumCouponChannelStatus.java new file mode 100644 index 000000000..d83740f0f --- /dev/null +++ b/mallinkService/src/main/java/com/simple/enums/EnumCouponChannelStatus.java @@ -0,0 +1,38 @@ +package com.simple.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumCouponChannelStatus { + + // 0-草稿/待生效;1-已生效/已发布/已投放;2-已下架; + + STATUS_THROW_IN(0, "已上架"), + STATUS_TAKE_OFFF(1, "已下架"), + ; + + public static EnumCouponChannelStatus getEnum(Integer code) { + for (EnumCouponChannelStatus value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumCouponChannelStatus(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} From 60e348351ecc2c6ce034f660d55b0e40b69ef121 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Mon, 27 Aug 2018 18:24:51 +0800 Subject: [PATCH 60/64] =?UTF-8?q?[=E8=AE=A2=E5=8D=95=E6=8E=A5=E5=8F=A3][?= =?UTF-8?q?=E6=96=B0=E5=A2=9E]:=E9=A2=91=E9=81=93IDcouponChannelId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/simple/domain/vo/WxCouponCVo.java | 11 +++++++++++ .../src/main/resources/mapper/WxCouponMapper.xml | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/simple/domain/vo/WxCouponCVo.java b/mallinkService/src/main/java/com/simple/domain/vo/WxCouponCVo.java index 8b051691a..39db0f5f7 100644 --- a/mallinkService/src/main/java/com/simple/domain/vo/WxCouponCVo.java +++ b/mallinkService/src/main/java/com/simple/domain/vo/WxCouponCVo.java @@ -50,6 +50,9 @@ public class WxCouponCVo implements Serializable { @Transient private String priceStr; + /*频道id**/ + @io.swagger.annotations.ApiModelProperty(value="频道id",name="couponChannelId") + private Long couponChannelId; /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -170,6 +173,13 @@ public class WxCouponCVo implements Serializable { private String floorName; + public Long getCouponChannelId() { + return couponChannelId; + } + + public void setCouponChannelId(Long couponChannelId) { + this.couponChannelId = couponChannelId; + } public String getTenantId() { return tenantId; @@ -437,6 +447,7 @@ public class WxCouponCVo implements Serializable { public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") + ,CouponChannelId_ASC("`couponChannelId` ASC"),CouponChannelId_DESC("`couponChannelId` DESC") ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") ,MerchantId_ASC("`merchantId` ASC"),MerchantId_DESC("`merchantId` DESC") ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 1c112f384..8293cd513 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -465,6 +465,7 @@ + @@ -507,7 +508,7 @@ - c.id,c.tenant_id,c.merchant_id,c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.use_limit_quantity,c.target_ad,c.send_type,c.valid_type,c.valid_start_date,c.valid_end_date,c.valid_days,c.detail,c.price,c.remain_inventory,c.inventory,c.remark,c.status,c.create_date,c.update_date,c.business, + c.id,cc.id as counpon_channel_id,c.tenant_id,c.merchant_id,c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.use_limit_quantity,c.target_ad,c.send_type,c.valid_type,c.valid_start_date,c.valid_end_date,c.valid_days,c.detail,c.price,c.remain_inventory,c.inventory,c.remark,c.status,c.create_date,c.update_date,c.business, m.img_url,m.name,m.link_phone,m.status, s.addr,s.shop_number,s.baidu_poi, mb.building_name,mf.floor_name, From 5dc97ef9fe9f142696773f37b6846a4081329488 Mon Sep 17 00:00:00 2001 From: masterspirit Date: Mon, 27 Aug 2018 19:01:04 +0800 Subject: [PATCH 61/64] =?UTF-8?q?[=E5=8D=A1=E5=88=B8=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/controller/WxCouponController.java | 11 +------ .../controller/WxCouponSendController.java | 8 +++++ .../simple/mapper/WxCouponChannelMapper.java | 2 ++ .../com/simple/mapper/WxCouponSendMapper.java | 2 ++ .../service/WxCouponChannelService.java | 2 ++ .../simple/service/WxCouponSendService.java | 2 ++ .../com/simple/service/WxCouponService.java | 3 ++ .../service/impl/CouponInjectServiceImpl.java | 4 +++ .../impl/WxCouponChannelServiceImpl.java | 8 +++++ .../service/impl/WxCouponSendServiceImpl.java | 9 ++++++ .../service/impl/WxCouponServiceImpl.java | 29 +++++++++++++++++++ .../mapper/WxCouponChannelMapper.xml | 5 ++++ .../resources/mapper/WxCouponSendMapper.xml | 4 +++ 13 files changed, 79 insertions(+), 10 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java index 7e341e8bc..4e47f2e65 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java @@ -133,20 +133,11 @@ public class WxCouponController extends BaseController if(wxCoupon.getId()==null) { return new ResultData(ResultData.ERROR,"缺少id"); } - if(wxCoupon.getStatus()!=null){ - if(wxCoupon.getStatus()==3){ //已作废 - WxCoupon temp = wxCouponService.getById(wxCoupon.getId()); - if(temp.getStatus()==1){ - return new ResultData(Result.ERROR,"生效的卡券,不能修改"); - } - } - } if(StringUtils.isNotBlank(wxCoupon.getBusiness())) { String[] arys = wxCoupon.getBusiness().split(","); wxCoupon.setBusiness(JSON.toJSONString(arys)); } - Long id = wxCouponService.saveOrUpdate(wxCoupon); - return new ResultData(id); + return wxCouponService.updateCoupon(wxCoupon); } @ApiOperation("根据id删除接口") diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSendController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSendController.java index dbf30bd28..b2b0dc92f 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSendController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponSendController.java @@ -46,11 +46,19 @@ public class WxCouponSendController extends BaseController @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxCouponSend wxCouponSend) { + if (null == wxCouponSend){ + return new ResultData(Result.ERROR,"参数不对"); + } + wxCouponSend.setTenantId(getTenantId()); + wxCouponSend.setStatus(0); List wxCouponSendList = wxCouponSendService.listAsPage(wxCouponSend,1,1).getList(); if(wxCouponSendList!=null&&!wxCouponSendList.isEmpty()){ return new ResultData(Result.ERROR,"已经添加过该券"); } WxCoupon wxCoupon = wxCouponService.getById(wxCouponSend.getCouponId()); + if(wxCoupon.getStatus()!=0||wxCoupon.getSendType()!=2){ + return new ResultData(Result.ERROR,"该券的状态有问题"); + } wxCouponSend.setMerchantId(wxCoupon.getMerchantId()); wxCouponSend.setType(wxCoupon.getType()); diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCouponChannelMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCouponChannelMapper.java index b5bd20448..613e9dd7f 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCouponChannelMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCouponChannelMapper.java @@ -11,6 +11,8 @@ public interface WxCouponChannelMapper extends CommonMapper findList(WxCouponChannel wxCouponChannel); List findVoList(WxCouponChannel wxCouponChannel); + + void updateStatusByCouponId(WxCouponChannel wxCouponChannel); diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCouponSendMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCouponSendMapper.java index a24aea6e4..50695b42f 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCouponSendMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCouponSendMapper.java @@ -8,6 +8,8 @@ import com.simple.domain.po.WxCouponSend; public interface WxCouponSendMapper extends CommonMapper { List findList(WxCouponSend wxCouponSend); + + void updateStatusByCouponId(WxCouponSend wxCouponSend); diff --git a/mallinkService/src/main/java/com/simple/service/WxCouponChannelService.java b/mallinkService/src/main/java/com/simple/service/WxCouponChannelService.java index 1b1d1a985..c1093fd49 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCouponChannelService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCouponChannelService.java @@ -43,6 +43,8 @@ public interface WxCouponChannelService { void deleteById(Long id); void addBatch(String[] ids, String[] channelId, String tanantId, Date beginTime,Date endTime); + + void updateStatusByCouponId(Long couponId,String tenantId,int status); diff --git a/mallinkService/src/main/java/com/simple/service/WxCouponSendService.java b/mallinkService/src/main/java/com/simple/service/WxCouponSendService.java index d388aa9c6..ce289abdd 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCouponSendService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCouponSendService.java @@ -45,6 +45,8 @@ public interface WxCouponSendService { * @param type 2:停车发券 3:核销发券 */ void sendCouponToUser(String tenantId,Long cUserId,int type); + + void updateStatusByCouponId(Long couponId,String tenantId,int status); diff --git a/mallinkService/src/main/java/com/simple/service/WxCouponService.java b/mallinkService/src/main/java/com/simple/service/WxCouponService.java index ea3aa7a7a..6dc34f35e 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCouponService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCouponService.java @@ -2,6 +2,7 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; +import com.simple.common.ResultData; import com.simple.domain.po.WxCoupon; import com.simple.domain.po.WxCouponChannel; import com.simple.domain.vo.WxCouponCVo; @@ -64,4 +65,6 @@ public interface WxCouponService { WxCouponCVo selectDetailForCUser(WxCouponChannel record); + ResultData updateCoupon(WxCoupon wxCoupon); + } diff --git a/mallinkService/src/main/java/com/simple/service/impl/CouponInjectServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/CouponInjectServiceImpl.java index bcedd2a97..9cf7b022a 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/CouponInjectServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/CouponInjectServiceImpl.java @@ -72,6 +72,10 @@ public class CouponInjectServiceImpl implements CouponInjectService { return new ResultData(Result.ERROR,"已过期"); } } + if(wxCoupon.getStatus()!=0||wxCoupon.getSendType()!=1){ + return new ResultData(Result.ERROR,"券状态有问题,不能投放"); + } + //解析前台tags,并转换json String[] arys = record.getTags().split(","); List tagids = new ArrayList<>(); diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponChannelServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponChannelServiceImpl.java index 7065d41c9..1de28ed00 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponChannelServiceImpl.java @@ -74,6 +74,14 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { } + @Override + public void updateStatusByCouponId(Long couponId, String tenantId, int status) { + WxCouponChannel wxCouponChannel = new WxCouponChannel(); + wxCouponChannel.setTenantId(tenantId); + wxCouponChannel.setStatus(status); + wxCouponChannel.setCouponId(couponId); + } + @Transactional public void addCuponChannel(Long couponid,Integer channelId,String tanantId,Date beginTime,Date endTime){ diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponSendServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponSendServiceImpl.java index 6aea7694a..5f131c8d1 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponSendServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponSendServiceImpl.java @@ -99,5 +99,14 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { } + @Override + public void updateStatusByCouponId(Long couponId, String tenantId, int status) { + WxCouponSend wxCouponSend = new WxCouponSend(); + wxCouponSend.setTenantId(tenantId); + wxCouponSend.setCouponId(couponId); + wxCouponSend.setStatus(status); + wxCouponSendMapper.updateStatusByCouponId(wxCouponSend); + } + } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponServiceImpl.java index 16abf5c23..727572056 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponServiceImpl.java @@ -3,20 +3,33 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; import com.simple.domain.po.WxCoupon; import com.simple.domain.po.WxCouponChannel; +import com.simple.domain.po.WxCouponSend; import com.simple.domain.vo.WxCouponCVo; +import com.simple.mapper.WxCouponChannelMapper; import com.simple.mapper.WxCouponMapper; +import com.simple.service.WxCampaignService; +import com.simple.service.WxCouponChannelService; +import com.simple.service.WxCouponSendService; import com.simple.service.WxCouponService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.simple.common.IdWorker; +import org.springframework.transaction.annotation.Transactional; @Service public class WxCouponServiceImpl implements WxCouponService { @Autowired WxCouponMapper wxCouponMapper; + @Autowired + WxCouponChannelService wxCouponChannelService; + + @Autowired + WxCouponSendService wxCouponSendService; @Override @@ -67,4 +80,20 @@ public class WxCouponServiceImpl implements WxCouponService { return wxCouponMapper.selectDetailForCUser(record); } + @Override + @Transactional + public ResultData updateCoupon(WxCoupon wxCoupon) { + WxCoupon query = wxCouponMapper.selectByPrimaryKey(wxCoupon.getId()); + if(wxCoupon.getStatus()!=null){ + if(wxCoupon.getStatus()==1){ //已作废 + //作废所有投放频道 + wxCouponChannelService.updateStatusByCouponId(wxCoupon.getId(),query.getTenantId(),1); + wxCouponSendService.updateStatusByCouponId(query.getId(),query.getTenantId(),1); + } + } + return new ResultData(saveOrUpdate(wxCoupon)); + + } + + } diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index 2ce097744..b6193895e 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -121,6 +121,11 @@ + + update wx_coupon_channel set status=#{status} where tenant_id=#{tenantId} and coupon_id=#{couponId} + + + diff --git a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml index bfc8a822e..27a4be553 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml @@ -100,6 +100,10 @@ + + update wx_coupon_send set status=#{status} where tenant_id=#{tenantId} and coupon_id=#{couponId} + + From 69f02bfd99533ac05da92bf50f4811795c9c2ab3 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 27 Aug 2018 19:09:14 +0800 Subject: [PATCH 62/64] =?UTF-8?q?[=E6=95=B0=E6=8D=AE=E5=A1=94=E5=8F=B0][?= =?UTF-8?q?=E8=BD=A6=E6=B5=81=E6=95=B0=E6=8D=AE]:=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/simple/service/impl/DataTowerServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/DataTowerServiceImpl.java index 42d122695..55db6dd7a 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/DataTowerServiceImpl.java @@ -190,7 +190,7 @@ public class DataTowerServiceImpl implements DataTowerService { TreeMap todaytreemap = getTimeTreeMap(); todaytreemap.putAll(todaycollect); - datamap.put("todaycar",todaytreemap); + datamap.put("todaycardata",todaytreemap); String yesterday = DateUtils.getTimeBefore(1, new Date()); params.put("startdate",yesterday+" 05:00:00"); @@ -204,7 +204,7 @@ public class DataTowerServiceImpl implements DataTowerService { TreeMap yesterdaytreemap = getTimeTreeMap(); yesterdaytreemap.putAll(yesterdaycollect); - datamap.put("yesterdaycar",yesterdaytreemap); + datamap.put("yesterdaycardata",yesterdaytreemap); params.put("startdate",startdate+" 05:00:00"); @@ -217,7 +217,7 @@ public class DataTowerServiceImpl implements DataTowerService { })); TreeMap lastdaytreemap = getTimeTreeMap(); lastdaytreemap.putAll(lastdaycollect); - datamap.put("lastdaycar",lastdaytreemap); + datamap.put("lastdaycardata",lastdaytreemap); return datamap; From 04e8c98e6b725e800a1567a88ed3d67df80dc813 Mon Sep 17 00:00:00 2001 From: hupeng Date: Mon, 27 Aug 2018 19:40:33 +0800 Subject: [PATCH 63/64] =?UTF-8?q?[C=E7=AB=AF][=E6=B7=BB=E5=8A=A0]:?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0C=E7=AB=AF=E8=AE=A2=E5=8D=95=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/controller/WxOrderController.java | 23 +- .../java/com/simple/domain/vo/WxOrderCVo.java | 404 ++++++++++++++++++ .../java/com/simple/mapper/WxOrderMapper.java | 5 + .../com/simple/service/WxOrderService.java | 16 +- .../service/impl/WxOrderServiceImpl.java | 13 + .../main/resources/mapper/WxOrderMapper.xml | 99 ++++- 6 files changed, 542 insertions(+), 18 deletions(-) create mode 100644 mallinkService/src/main/java/com/simple/domain/vo/WxOrderCVo.java diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxOrderController.java b/mallinkCApi/src/main/java/com/simple/controller/WxOrderController.java index dbebdc5ef..05ee45d5e 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxOrderController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxOrderController.java @@ -3,6 +3,7 @@ package com.simple.controller; import com.simple.common.ErrorCode; import com.simple.domain.po.WxCUser; import com.simple.domain.po.WxCouponChannel; +import com.simple.domain.vo.WxOrderCVo; import com.simple.enums.EnumCouponChannelStatus; import com.simple.enums.EnumCouponStatus; import com.simple.enums.EnumOrderStatus; @@ -191,18 +192,26 @@ public class WxOrderController extends BaseController { @ApiImplicitParams({ @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="orderStatus",value="订单状态0-已下单/待付款;1-已支付;2-已取消",dataType="int", paramType = "query",required=false) }) - public ResultData list(Integer orderStatus, Integer pageNum, Integer pageSize) { + public ResultData list(@ModelAttribute WxOrder wxOrder, Integer pageNum, Integer pageSize) { // c端用户应该只能看到自己的订单 - WxCUser user = getUser(); - WxOrder wxOrderQ = new WxOrder(); - wxOrderQ.setCUserId(user.getId()); - wxOrderQ.setOrderStatus(orderStatus); - final PageInfo page = wxOrderService.listAsPage(wxOrderQ, pageNum, pageSize); + if (wxOrder == null) wxOrder = new WxOrder(); + wxOrder.setCUserId(getUser().getId()); + final PageInfo page = wxOrderService.listCUserVoAsPage(wxOrder, pageNum, pageSize); return new ResultData(page); } + @ApiOperation("订单详情接口") + @GetMapping("detail") + public ResultData list(@ModelAttribute WxOrder wxOrder) { + // c端用户应该只能看到自己的订单细节 + if (wxOrder == null) wxOrder = new WxOrder(); + wxOrder.setCUserId(getUser().getId()); + WxOrderCVo wxOrderCVo = wxOrderService.detailCUserVo(wxOrder); + if (wxOrderCVo == null) + return new ResultData(ErrorCode.ORDER_IS_NOT_FIND); + return new ResultData(wxOrderCVo); + } @ApiOperation(value = "根据orderId查询接口", notes = "{\"orderId\":\"string\"}") @GetMapping("/findById") public ResultData findById(@RequestBody Map paramMap) { diff --git a/mallinkService/src/main/java/com/simple/domain/vo/WxOrderCVo.java b/mallinkService/src/main/java/com/simple/domain/vo/WxOrderCVo.java new file mode 100644 index 000000000..4c8d4a504 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/domain/vo/WxOrderCVo.java @@ -0,0 +1,404 @@ +package com.simple.domain.vo; + +import com.simple.domain.po.WxCouponOrder; +import com.simple.domain.po.WxOrder; + +import javax.persistence.Id; +import javax.persistence.Transient; +import java.util.Date; +import java.util.List; + +public class WxOrderCVo extends WxCouponOrder{ + + /** + * + */ + private static final long serialVersionUID = 6687954932922444531L; + + + @Id + protected Long id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + + public void setIds(List ids) { + this.ids = ids; + } + + + /* 基础购买到的券信息 */ + + /*订单码;正反向交易保持一致。**/ + @io.swagger.annotations.ApiModelProperty(value="订单码;正反向交易保持一致。",name="orderNumber") + private Long orderNumber; + /*租户ID**/ + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + private String tenantId; + /*c端用户id**/ + @io.swagger.annotations.ApiModelProperty(value="c端用户id",name="cUserId") + private Long cUserId; + /*商户ID**/ + @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") + private Long merchantId; + /*操作券B端小程序用户ID**/ + @io.swagger.annotations.ApiModelProperty(value="操作券B端小程序用户ID",name="bUserId") + private Long bUserId; + /*券ID-产品ID将来的产品都会放在coupon表里**/ + @io.swagger.annotations.ApiModelProperty(value="券ID",name="couponId") + private Long couponId; + /*0: 付款 1: 退款**/ + @io.swagger.annotations.ApiModelProperty(value="0: 付款 1: 退款",name="paymentType") + private Integer paymentType; + /*支付金额(分):允许有负数,退款时为负值。**/ + @io.swagger.annotations.ApiModelProperty(value="支付金额(分):允许有负数,退款时为负值。",name="payment") + private Integer payment; + /*支付时间**/ + @io.swagger.annotations.ApiModelProperty(value="支付时间",name="paymentTime") + private Date paymentTime; + /*订单状态:-1全部;正向交易:0-已下单/待付款;1-已支付;2-已取消(限定时间内未付款)反向交易:3-已退款;4-退款失败**/ + @io.swagger.annotations.ApiModelProperty(value="订单状态:-1全部;正向交易:0-已下单/待付款;1-已支付;2-已取消(限定时间内未付款)反向交易:3-已退款;4-退款失败",name="orderStatus") + private Integer orderStatus; + /*创建时间**/ + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") + private Date createDate; + /*更新时间**/ + @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") + private Date updateDate; + + + /* 券类型信息 */ + /*商户id**/ + /*券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)**/ + @io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)",name="type") + private Integer type; + /*封面图**/ + @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") + private String coverImg; + /*券名称**/ + @io.swagger.annotations.ApiModelProperty(value="券名称",name="title") + private String title; + /*副标题**/ + @io.swagger.annotations.ApiModelProperty(value="副标题",name="subTitle") + private String subTitle; + /*售价(适用于类型2,3,4,5)**/ + @io.swagger.annotations.ApiModelProperty(value="售价(适用于类型2,3,4,5)",name="salePrice") + private Integer salePrice; + /*使用条件金额(适用于类型1,2,3,4)**/ + @io.swagger.annotations.ApiModelProperty(value="使用条件金额(适用于类型1,2,3,4)",name="usePrice") + private Integer usePrice; + /*面额**/ + @io.swagger.annotations.ApiModelProperty(value="面额",name="price") + private Integer price; + /*须知**/ + @io.swagger.annotations.ApiModelProperty(value="须知",name="detail") + private String detail; + /*购买须知**/ + @io.swagger.annotations.ApiModelProperty(value="购买须知",name="remark") + private String remark; + + /*发券商户信息*/ + /*商户图片**/ + @io.swagger.annotations.ApiModelProperty(value="商户图片",name="imgUrl") + private String merchantImgUrl; + /*商户名**/ + @io.swagger.annotations.ApiModelProperty(value="商户名",name="name") + private String merchantName; + /*联系方式**/ + @io.swagger.annotations.ApiModelProperty(value="商户联系方式",name="linkPhone") + private String merchantLinkPhone; + /*商户状态**/ + @io.swagger.annotations.ApiModelProperty(value="商户状态1可用0停用",name="status") + private Integer merchantStatus; + + + /*地址**/ + @io.swagger.annotations.ApiModelProperty(value="地址",name="addr") + private String addr; + /*百度poi(省市区县street等)**/ + @io.swagger.annotations.ApiModelProperty(value="百度poi(省市区县street等)",name="baiduPoi") + private String baiduPoi; + /*商铺编号**/ + @io.swagger.annotations.ApiModelProperty(value="商铺编号",name="shopNumber") + private String shopNumber; + /*楼座号**/ + @io.swagger.annotations.ApiModelProperty(value="楼座",name="buildingName") + private String buildingName; + /*楼层号**/ + @io.swagger.annotations.ApiModelProperty(value="楼层",name="floorName") + private String floorName; + + public Long getOrderNumber() { + return orderNumber; + } + public void setOrderNumber(Long _orderNumber) { + orderNumber = _orderNumber; + } + public String getTenantId() { + return tenantId; + } + public void setTenantId(String _tenantId) { + tenantId = _tenantId; + } + public Long getCUserId() { + return cUserId; + } + public void setCUserId(Long _cUserId) { + cUserId = _cUserId; + } + public Long getMerchantId() { + return merchantId; + } + public void setMerchantId(Long _merchantId) { + merchantId = _merchantId; + } + public Long getBUserId() { + return bUserId; + } + public void setBUserId(Long _bUserId) { + bUserId = _bUserId; + } + public Long getCouponId() { + return couponId; + } + + public void setCouponId(Long _couponId) { + this.couponId = _couponId; + } + + public Integer getPaymentType() { + return paymentType; + } + public void setPaymentType(Integer _paymentType) { + paymentType = _paymentType; + } + public Integer getPayment() { + return payment; + } + public void setPayment(Integer _payment) { + payment = _payment; + } + public Date getPaymentTime() { + return paymentTime; + } + public void setPaymentTime(Date _paymentTime) { + paymentTime = _paymentTime; + } + public Integer getOrderStatus() { + return orderStatus; + } + public void setOrderStatus(Integer _orderStatus) { + orderStatus = _orderStatus; + } + public Date getCreateDate() { + return createDate; + } + public void setCreateDate(Date _createDate) { + createDate = _createDate; + } + public Date getUpdateDate() { + return updateDate; + } + public void setUpdateDate(Date _updateDate) { + updateDate = _updateDate; + } + + + public Integer getType() { + return type; + } + public void setType(Integer _type) { + type = _type; + } + public String getCoverImg() { + return coverImg; + } + public void setCoverImg(String _coverImg) { + coverImg = _coverImg; + } + public String getTitle() { + return title; + } + public void setTitle(String _title) { + title = _title; + } + public String getSubTitle() { + return subTitle; + } + public void setSubTitle(String _subTitle) { + subTitle = _subTitle; + } + public Integer getSalePrice() { + return salePrice; + } + public void setSalePrice(Integer _salePrice) { + salePrice = _salePrice; + } + public Integer getUsePrice() { + return usePrice; + } + public void setUsePrice(Integer _usePrice) { + usePrice = _usePrice; + } + public String getDetail() { + return detail; + } + public void setDetail(String _detail) { + detail = _detail; + } + public Integer getPrice() { + return price; + } + public void setPrice(Integer _price) { + price = _price; + } + public String getRemark() { + return remark; + } + public void setRemark(String _remark) { + remark = _remark; + } + + public String getBuildingName() {return buildingName; } + public void setBuildingName(String _building) { + buildingName = _building; + } + public String getFloorName() { + return floorName; + } + public void setFloorName(String _floor) { + floorName = _floor; + } + public String getShopNumber() { + return shopNumber; + } + public void setShopNumber(String _shopNumber) { + shopNumber = _shopNumber; + } + public String getBaiduPoi() { + return baiduPoi; + } + public void setBaiduPoi(String _baiduPoi) { + baiduPoi = _baiduPoi; + } + public String getAddr() { + return addr; + } + public void setAddr(String _addr) { + addr = _addr; + } + + + public String getMerChantImgUrl() { + return merchantImgUrl; + } + public void setMerChantImgUrl(String _imgUrl) { + merchantImgUrl = _imgUrl; + } + public String getMerchantName() { + return merchantName; + } + public void setMerchantName(String _name) { + merchantName = _name; + } + public String getMerchantLinkPhone() { + return merchantLinkPhone; + } + public void setMerchantLinkPhone(String _linkPhone) { + merchantLinkPhone = _linkPhone; + } + public Integer getMerchantStatus() { + return merchantStatus; + } + public void setMerchantStatus(Integer status) { + this.merchantStatus = status; + } + + + public static enum Field + { + Id_ASC("`id` ASC"),Id_DESC("`id` DESC") + ,OrderNumber_ASC("`orderNumber` ASC"),OrderNumber_DESC("`orderNumber` DESC") + ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") + ,CUserId_ASC("`cUserId` ASC"),CUserId_DESC("`cUserId` DESC") + ,MerchantId_ASC("`merchantId` ASC"),MerchantId_DESC("`merchantId` DESC") + ,BUserId_ASC("`bUserId` ASC"),BUserId_DESC("`bUserId` DESC") + ,CouponId_ASC("`couponId` ASC"),CouponId_DESC("`couponId` DESC") + ,PaymentType_ASC("`paymentType` ASC"),PaymentType_DESC("`paymentType` DESC") + ,Payment_ASC("`payment` ASC"),Payment_DESC("`payment` DESC") + ,PaymentTime_ASC("`paymentTime` ASC"),PaymentTime_DESC("`paymentTime` DESC") + ,OrderStatus_ASC("`orderStatus` ASC"),OrderStatus_DESC("`orderStatus` DESC") + ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") + ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC") + ,Detail_ASC("`detail` ASC"),Detail_DESC("`detail` DESC") + ; + private String value; + Field(String value){ + this.value = value; + } + public String getValue() { + return value; + } + public void setCol(String value) { + this.value = value; + } + @Override + public String toString() { + return this.getValue(); + } + } + + public void setSortColumns(WxOrder.Field... fields) + { + if (fields == null || fields.length == 0) { + return; + } + for (int k = 0; k < fields.length; k++) { + if (fields[k] == null) { + return; + } + } + StringBuilder sb = new StringBuilder(fields[0].toString()); + for (int k = 1; k < fields.length; k++) { + sb.append(","); + sb.append(fields[k].toString()); + } + + } + + public void setSortColumns(String sortColumns) + { + if (sortColumns == null || "".equals(sortColumns.trim())) { + return; + } + if (sortColumns.contains(",")) { + String[] cols = sortColumns.split(","); + java.util.List fList = new java.util.ArrayList(); + for (int k = 0; k < cols.length; k++) { + fList.add(WxOrder.Field.valueOf(cols[k])); + } + this.setSortColumns(fList.toArray(new WxOrder.Field[fList.size()])); + } else { + this.setSortColumns(WxOrder.Field.valueOf(sortColumns)); + } + } + +} diff --git a/mallinkService/src/main/java/com/simple/mapper/WxOrderMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxOrderMapper.java index 781ac4700..ad5230ed7 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxOrderMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxOrderMapper.java @@ -3,6 +3,7 @@ package com.simple.mapper; import java.util.*; import com.simple.common.CommonMapper; import com.simple.domain.po.WxCouponOrder; +import com.simple.domain.vo.WxOrderCVo; import org.apache.ibatis.annotations.Param; import com.simple.domain.po.WxOrder; @@ -11,4 +12,8 @@ public interface WxOrderMapper extends CommonMapper { List findList(WxOrder wxOrder); List findListOfUnpaidOrderByDate(Map dateMap); + + List findListOfCUser(WxOrder wxOrder); + WxOrderCVo selectDetailOfCUser(WxOrder wxOrder); + } diff --git a/mallinkService/src/main/java/com/simple/service/WxOrderService.java b/mallinkService/src/main/java/com/simple/service/WxOrderService.java index ee4a228a9..24c7d638e 100644 --- a/mallinkService/src/main/java/com/simple/service/WxOrderService.java +++ b/mallinkService/src/main/java/com/simple/service/WxOrderService.java @@ -1,9 +1,12 @@ package com.simple.service; import java.util.*; + +import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.simple.domain.po.WxCUser; import com.simple.domain.po.WxOrder; +import com.simple.domain.vo.WxOrderCVo; import com.simple.enums.EnumOrderStatus; public interface WxOrderService { @@ -77,12 +80,11 @@ public interface WxOrderService { */ List findList(WxOrder record); - - - - - - - + + PageInfo listCUserVoAsPage(WxOrder record, Integer pageIndex, Integer pageSize); + + + WxOrderCVo detailCUserVo(WxOrder record); + } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java index ce70bed53..0ec1a8ef5 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java @@ -4,10 +4,13 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.simple.common.ErrorCode; import com.simple.common.IdWorker; +import com.simple.common.ResultData; import com.simple.domain.po.WxCUser; import com.simple.domain.po.WxCoupon; import com.simple.domain.po.WxCouponOrder; import com.simple.domain.po.WxOrder; +import com.simple.domain.vo.WxCouponOrderCVo; +import com.simple.domain.vo.WxOrderCVo; import com.simple.enums.*; import com.simple.exception.MallinkException; import com.simple.mapper.*; @@ -20,6 +23,7 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -458,5 +462,14 @@ public class WxOrderServiceImpl implements WxOrderService { return wxOrderMapper.findList(record); } + @Override + public PageInfo listCUserVoAsPage(WxOrder record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxOrderMapper.findListOfCUser(record)); + } + + @Override + public WxOrderCVo detailCUserVo(WxOrder record) { + return wxOrderMapper.selectDetailOfCUser(record); + } } diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index 9d0ee784a..81877325f 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -112,13 +112,104 @@ + + + + o.id,o.order_number,o.tenant_id,o.c_user_id,o.merchant_id,o.b_user_id,o.payment_type,o.payment,o.payment_time,o.order_status,o.create_date,o.update_date, + co.cover_img,co.title,co.sub_title,co.sale_price,co.use_price,co.price, + m.name + + + + o.id,o.order_number,o.tenant_id,o.c_user_id,o.merchant_id,o.b_user_id,o.payment_type,o.payment,o.payment_time,o.order_status,o.create_date,o.update_date, + co.type,co.cover_img,co.title,co.sub_title,co.sale_price,co.use_price,co.price,co.detail,co.remark, + m.img_url,m.name,m.link_phone,m.status, + s.addr,s.shop_number,s.baidu_poi, + mb.building_name,mf.floor_name + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 6b467a77fd317853c0f5204b170b703a76178993 Mon Sep 17 00:00:00 2001 From: hupeng Date: Mon, 27 Aug 2018 20:00:50 +0800 Subject: [PATCH 64/64] =?UTF-8?q?[C=E7=AB=AF][=E6=9B=B4=E6=94=B9]:?= =?UTF-8?q?=E6=9B=B4=E6=96=B0couponCVo=E7=9A=84=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/simple/domain/vo/WxCouponCVo.java | 61 ++++++++++--------- .../main/resources/mapper/WxCouponMapper.xml | 16 +++-- 2 files changed, 41 insertions(+), 36 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/domain/vo/WxCouponCVo.java b/mallinkService/src/main/java/com/simple/domain/vo/WxCouponCVo.java index 39db0f5f7..6a6f9abb2 100644 --- a/mallinkService/src/main/java/com/simple/domain/vo/WxCouponCVo.java +++ b/mallinkService/src/main/java/com/simple/domain/vo/WxCouponCVo.java @@ -12,6 +12,7 @@ import java.util.List; public class WxCouponCVo implements Serializable { private static final long serialVersionUID = 1L; + /*投放券频道id**/ @Id protected Long id; @@ -50,9 +51,20 @@ public class WxCouponCVo implements Serializable { @Transient private String priceStr; - /*频道id**/ - @io.swagger.annotations.ApiModelProperty(value="频道id",name="couponChannelId") - private Long couponChannelId; + + + /*发放相关参数*/ + /*卡券id**/ + @io.swagger.annotations.ApiModelProperty(value="卡券id",name="couponId") + private Long couponId; + /*开始时间**/ + @io.swagger.annotations.ApiModelProperty(value="开始时间",name="beginTime") + private Date beginTime; + /*结束时间**/ + @io.swagger.annotations.ApiModelProperty(value="结束时间",name="endTime") + private Date endTime; + + /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -132,14 +144,6 @@ public class WxCouponCVo implements Serializable { @io.swagger.annotations.ApiModelProperty(value="业态",name="business") private String business; - /*发放相关参数*/ - /*开始时间**/ - @io.swagger.annotations.ApiModelProperty(value="开始时间",name="beginTime") - private Date beginTime; - /*结束时间**/ - @io.swagger.annotations.ApiModelProperty(value="结束时间",name="endTime") - private Date endTime; - /*发券商户信息*/ /*商户图片**/ @@ -173,12 +177,23 @@ public class WxCouponCVo implements Serializable { private String floorName; - public Long getCouponChannelId() { - return couponChannelId; + public Date getBeginTime() { + return beginTime; } - - public void setCouponChannelId(Long couponChannelId) { - this.couponChannelId = couponChannelId; + public void setBeginTime(Date _beginTime) { + beginTime = _beginTime; + } + public Date getEndTime() { + return endTime; + } + public void setEndTime(Date _endTime) { + endTime = _endTime; + } + public Long getCouponId() { + return couponId; + } + public void setCouponId(Long _couponId) { + couponId = _couponId; } public String getTenantId() { @@ -374,20 +389,6 @@ public class WxCouponCVo implements Serializable { } - public Date getBeginTime() { - return beginTime; - } - public void setBeginTime(Date _beginTime) { - beginTime = _beginTime; - } - public Date getEndTime() { - return endTime; - } - public void setEndTime(Date _endTime) { - endTime = _endTime; - } - - public String getBuildingName() {return buildingName; } public void setBuildingName(String _building) { buildingName = _building; diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 8293cd513..27806625e 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -465,7 +465,11 @@ - + + + + + @@ -491,9 +495,6 @@ - - - @@ -508,11 +509,11 @@ - c.id,cc.id as counpon_channel_id,c.tenant_id,c.merchant_id,c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.use_limit_quantity,c.target_ad,c.send_type,c.valid_type,c.valid_start_date,c.valid_end_date,c.valid_days,c.detail,c.price,c.remain_inventory,c.inventory,c.remark,c.status,c.create_date,c.update_date,c.business, + c.tenant_id,c.merchant_id,c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.use_limit_quantity,c.target_ad,c.send_type,c.valid_type,c.valid_start_date,c.valid_end_date,c.valid_days,c.detail,c.price,c.remain_inventory,c.inventory,c.remark,c.status,c.create_date,c.update_date,c.business, m.img_url,m.name,m.link_phone,m.status, s.addr,s.shop_number,s.baidu_poi, mb.building_name,mf.floor_name, - cc.begin_time,cc.end_time + cc.id,cc.coupon_id,cc.begin_time,cc.end_time @@ -526,6 +527,9 @@ left join wx_mall_floor mf on s.floor = mf.id where c.merchant_id = m.id and cc.coupon_id = c.id + + and cc.id = #{id} + and c.id = #{couponId}