From dfed289cf4969013f3198314e5ed166ae29cc033 Mon Sep 17 00:00:00 2001 From: masterspirit Date: Thu, 23 Aug 2018 13:06:50 +0800 Subject: [PATCH 01/58] =?UTF-8?q?[banner][=E6=96=B0=E5=A2=9E]:CAPI?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E7=9C=8Bbanner=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCampaignController.java | 94 +++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxCampaignController.java diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCampaignController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCampaignController.java new file mode 100644 index 000000000..b914ec35c --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCampaignController.java @@ -0,0 +1,94 @@ +package com.simple.controller; + +import com.alibaba.fastjson.JSON; +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; +import com.simple.domain.po.WxCampaign; +import com.simple.domain.po.WxCoupon; +import com.simple.service.WxCampaignService; +import com.simple.service.WxCouponService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; +import java.util.List; + +import static com.simple.domain.po.WxCampaign.Field.SortNum_ASC; + +@RestController +@RequestMapping("wxCampaign") +@Api(description="促销和banner接口") +public class WxCampaignController extends BaseController +{ + @Autowired + private WxCampaignService wxCampaignService; + @Autowired + private WxCouponService wxCouponService; + + private Logger logger = Logger.getLogger(WxCampaignController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxCampaign wxCampaign, Integer pageNum, Integer pageSize) { + if (null == wxCampaign) wxCampaign = new WxCampaign(); + if(wxCampaign.getStatus()!=null&&wxCampaign.getStatus()==-1){ + wxCampaign.setStatus(null); + } + wxCampaign.setTenantId(getTenantId()); + wxCampaign.setSortColumns(SortNum_ASC); + final PageInfo page = wxCampaignService.listAsPage(wxCampaign, pageNum, pageSize); + return new ResultData(page); + } + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + WxCampaign wxCampaign = wxCampaignService.getById(id); + if (wxCampaign != null) { + List list = new ArrayList<>(); + List templist = JSON.parseArray(wxCampaign.getCouponIds(), String.class); + for (String temp : templist + ) { + list.add(Long.parseLong(temp)); + } + WxCoupon wxCoupon = new WxCoupon(); + wxCoupon.setTenantId(getTenantId()); + wxCoupon.setIds(list); + wxCoupon.setStatus(1); + List couponlist = wxCouponService.findList(wxCoupon); + wxCampaign.setCoupons(couponlist); + } + return new ResultData(Result.SUCCESS, "查询成功", wxCampaign); + } + + @ApiOperation("调整顺序") + @GetMapping("/move") + @ApiImplicitParams({ + @ApiImplicitParam(name="sourceId",value="",dataType="Long", paramType = "query",required=true), + @ApiImplicitParam(name="targetId",value="",dataType="Long", paramType = "query",required=true)}) + public ResultData move(Long sourceId,Long targetId) { + WxCampaign source = wxCampaignService.getById(sourceId); + WxCampaign target = wxCampaignService.getById(targetId); + if(source==null||target==null){ + return new ResultData(Result.ERROR, "调整顺序失败", null); + } + int temp =source.getSortNum(); + source.setSortNum(target.getSortNum()); + target.setSortNum(temp); + wxCampaignService.saveOrUpdate(source); + wxCampaignService.saveOrUpdate(target); + return new ResultData(Result.SUCCESS, "调整顺序成功", null); + } + + +} From 6335207f8f0f6034e89c24aaef86bd32c2e5ac00 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Thu, 23 Aug 2018 12:51:12 +0800 Subject: [PATCH 02/58] =?UTF-8?q?[=E6=94=AF=E4=BB=98][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E6=89=BE=E4=B8=8D=E5=88=B0=E5=88=B8=EF=BC=8C=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxOrderServiceImpl.java | 63 ++++++++++++------- 1 file changed, 40 insertions(+), 23 deletions(-) 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 8829ef98b..01858c001 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java @@ -1,11 +1,13 @@ package com.simple.service.impl; -import java.util.*; - import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.simple.common.ErrorCode; -import com.simple.domain.po.*; +import com.simple.common.IdWorker; +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; @@ -15,10 +17,13 @@ import com.simple.utils.RedisLock; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.simple.common.IdWorker; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import java.util.Date; +import java.util.List; +import java.util.Map; + @Service public class WxOrderServiceImpl implements WxOrderService { @@ -42,13 +47,13 @@ public class WxOrderServiceImpl implements WxOrderService { @Autowired WxCUserMapper wxCUserMapper; - @Autowired + @Autowired WxCouponMapper wxCouponMapper; - @Autowired + @Autowired WxOrderMapper wxOrderMapper; - @Autowired + @Autowired WxCouponOrderMapper wxCouponOrderMapper; @Override @@ -57,12 +62,12 @@ public class WxOrderServiceImpl implements WxOrderService { } @Override - public PageInfo> bQueryListMap(OrderVo orderVo, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(()->wxOrderMapper.queryListMap(orderVo)); + public PageInfo> bQueryListMap(OrderVo orderVo, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxOrderMapper.queryListMap(orderVo)); } @Override - public Map queryObject(OrderVo orderVo) { + public Map queryObject(OrderVo orderVo) { return wxOrderMapper.queryObject(orderVo); } @@ -77,7 +82,7 @@ public class WxOrderServiceImpl implements WxOrderService { orderQ.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); try { countOrder = wxOrderMapper.selectCount(orderQ); - }catch (Exception e) { + } catch (Exception e) { logger.error("购买是否超限-DB, couponId: " + counpon.getId() + ", e:" + e.getMessage()); throw new MallinkException(ErrorCode.ORDER_IS_FAIL); } @@ -88,7 +93,7 @@ public class WxOrderServiceImpl implements WxOrderService { couponOrderQ.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); try { countCouponOrder = wxCouponOrderMapper.selectCount(couponOrderQ); - }catch (Exception e) { + } catch (Exception e) { logger.error("购买是否超限-DB, couponId: " + counpon.getId() + ", e:" + e.getMessage()); throw new MallinkException(ErrorCode.ORDER_IS_FAIL); } @@ -100,7 +105,7 @@ public class WxOrderServiceImpl implements WxOrderService { long time = System.currentTimeMillis() + RedisLock.TIMEOUT; String timeStr = String.valueOf(time); // 库存加锁 - if(!redisLock.lock(couponIdStr, timeStr)) { + if (!redisLock.lock(couponIdStr, timeStr)) { logger.error("此券被锁定, couponId: " + couponIdStr); throw new MallinkException(ErrorCode.TOO_MANY_REQUEST); } @@ -153,13 +158,25 @@ public class WxOrderServiceImpl implements WxOrderService { long time = System.currentTimeMillis() + RedisLock.TIMEOUT; String timeStr = String.valueOf(time); - if(!redisLock.lock(couponIdStr, timeStr)) { + if (!redisLock.lock(couponIdStr, timeStr)) { logger.error("此券被锁定, couponId: " + couponIdStr); throw new MallinkException(ErrorCode.TOO_MANY_REQUEST); } + WxCoupon coupon = null; + try { + coupon = wxCouponMapper.selectByPrimaryKey(couponId); + } catch (Exception e) { + logger.error("券未找到, e:" + e.getMessage()); + throw new MallinkException(ErrorCode.COUPON_ORDER_IS_NULL.getCode(), "券未找到:" + couponIdStr); + } + if (coupon == null) { + logger.error("券未找到, " + couponIdStr); + throw new MallinkException(ErrorCode.COUPON_ORDER_IS_NULL.getCode(), "券未找到:" + couponIdStr); + } + + coupon.setRemainInventory(coupon.getRemainInventory() + 1); + try { - WxCoupon coupon = wxCouponMapper.selectByPrimaryKey(couponId); - coupon.setRemainInventory(coupon.getRemainInventory() + 1); wxCouponMapper.updateByPrimaryKeySelective(coupon); } catch (Exception e) { logger.error("库存+1失败, e:" + e.getMessage()); @@ -249,15 +266,16 @@ public class WxOrderServiceImpl implements WxOrderService { /** * 创建 couponOrder + * * @param user * @param order * @param coupon */ private void createCouponOrder(WxCUser user, WxOrder order, WxCoupon coupon) { Date curr = new Date(); - Date valid_date = (coupon.getValidType() == EnumValidStatus.VALID_RANGE.getCode())? - coupon.getValidEndDate(): - new Date((curr.getTime()/1000+coupon.getValidDays()*24*60*60)*1000); + Date valid_date = (coupon.getValidType() == EnumValidStatus.VALID_RANGE.getCode()) ? + coupon.getValidEndDate() : + new Date((curr.getTime() / 1000 + coupon.getValidDays() * 24 * 60 * 60) * 1000); final IdWorker idWorker = IdWorker.get(); try { WxCouponOrder couponOrder = new WxCouponOrder(); @@ -400,8 +418,7 @@ public class WxOrderServiceImpl implements WxOrderService { Date currentDate = new Date(); switch (enumOrderStatus) { case ORDER_STATUS_OVERTIME_CANCEL: - case ORDER_STATUS_REFUND_SUCCESS: - { + case ORDER_STATUS_REFUND_SUCCESS: { try { stockBack(updateOrder); } catch (Exception e) { @@ -416,7 +433,7 @@ public class WxOrderServiceImpl implements WxOrderService { updateOrder.setOrderStatus(enumOrderStatus.getCode()); updateOrder.setUpdateDate(currentDate); ret = wxOrderMapper.updateByPrimaryKey(updateOrder); - }catch (Exception e) { + } catch (Exception e) { logger.error("订单状态更新失败, e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "订单状态更新失败, e:" + e.getMessage()); } @@ -433,7 +450,7 @@ public class WxOrderServiceImpl implements WxOrderService { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); - record.setId(idWorker.nextId()); + record.setId(idWorker.nextId()); wxOrderMapper.insertSelective(record); } else { wxOrderMapper.updateByPrimaryKeySelective(record); From 6ebfc9074a391aa8f105afd58591d46a6e039811 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Thu, 23 Aug 2018 15:05:40 +0800 Subject: [PATCH 03/58] =?UTF-8?q?[=E6=94=AF=E4=BB=98/=E9=80=80=E6=AC=BE][?= =?UTF-8?q?=E6=96=B0=E5=A2=9E]:=E6=94=AF=E4=BB=98couponId=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/simple/service/impl/WxOrderServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 01858c001..f0960f805 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java @@ -242,6 +242,7 @@ public class WxOrderServiceImpl implements WxOrderService { record.setId(orderNumber); record.setTenantId(user.getTenantId()); record.setOrderNumber(orderNumber); + record.setCouponId(couponId); record.setCUserId(user.getId()); record.setMerchantId(coupon.getMerchantId()); record.setPaymentType(EnumPayType.PAY_PAYMENT.getCode()); From 0a6ee22608207c6258ce601a50f37ee397f7f94f Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 23 Aug 2018 16:47:16 +0800 Subject: [PATCH 04/58] =?UTF-8?q?[B=E7=AB=AF][=E6=96=B0=E5=A2=9E]:?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8E=B7=E5=8F=96=E8=BF=917=E6=97=A5?= =?UTF-8?q?=E8=A7=A3=E5=8D=95=E9=A2=9D=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxMerchantTradeDailyController.java | 6 +++ .../java/com/simple/common/ErrorCode.java | 4 +- .../mapper/WxMerchantTradeDailyMapper.java | 4 +- .../service/WxMerchantTradeDailyService.java | 9 ++++- .../impl/WxMerchantTradeDailyServiceImpl.java | 37 ++++++++++++++++++- .../mapper/WxMerchantTradeDailyMapper.xml | 20 +++++++++- 6 files changed, 71 insertions(+), 9 deletions(-) diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java index a72efcc83..2efde81d3 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java @@ -33,6 +33,12 @@ public class WxMerchantTradeDailyController extends BaseController return wxMerchantTradeDailyService.getVolume(getUser().getId()); } + @ApiOperation("获得近7日解单") + @GetMapping("/getVolumeOfWeek") + public ResultData getVolumeOfWeek() { + return wxMerchantTradeDailyService.getVolumeOfWeek(getUser().getId()); + } + @ApiOperation("上报每日解单") @GetMapping("/reportDailyVolume") @ApiImplicitParam(name="volume",value="总金额(分)",dataType="Integer", paramType = "query",required=true) diff --git a/mallinkService/src/main/java/com/simple/common/ErrorCode.java b/mallinkService/src/main/java/com/simple/common/ErrorCode.java index 3ba3ef047..4bc398383 100644 --- a/mallinkService/src/main/java/com/simple/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/simple/common/ErrorCode.java @@ -156,8 +156,8 @@ public enum ErrorCode{ /** * 解单 */ - DALIY_REPORT_VOLUME_TODAY_NULL(12070, "今日解单不存在") - + DALIY_REPORT_VOLUME_TODAY_NULL(12070, "今日解单不存在"), + DALIY_REPORT_VOLUME_WEEK_NULL(12070, "无解单数据") ; diff --git a/mallinkService/src/main/java/com/simple/mapper/WxMerchantTradeDailyMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxMerchantTradeDailyMapper.java index f08ec96df..d138eb02c 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxMerchantTradeDailyMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxMerchantTradeDailyMapper.java @@ -8,9 +8,9 @@ import com.simple.domain.po.WxMerchantTradeDaily; public interface WxMerchantTradeDailyMapper extends CommonMapper { List findList(WxMerchantTradeDaily wxMerchantTradeDaily); - - + + List findListOfWeek(WxMerchantTradeDaily wxMerchantTradeDaily); diff --git a/mallinkService/src/main/java/com/simple/service/WxMerchantTradeDailyService.java b/mallinkService/src/main/java/com/simple/service/WxMerchantTradeDailyService.java index de7eb8354..f7ae4d9b3 100644 --- a/mallinkService/src/main/java/com/simple/service/WxMerchantTradeDailyService.java +++ b/mallinkService/src/main/java/com/simple/service/WxMerchantTradeDailyService.java @@ -54,8 +54,13 @@ public interface WxMerchantTradeDailyService { */ public ResultData getVolume(Long userId); - - + + + /** + * 获取近7日解单数据 + */ + + public ResultData getVolumeOfWeek(Long userId); } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantTradeDailyServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantTradeDailyServiceImpl.java index daf381fed..c6c6b3fe8 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantTradeDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantTradeDailyServiceImpl.java @@ -149,7 +149,42 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ return new ResultData(ErrorCode.DALIY_REPORT_VOLUME_TODAY_NULL); } - + + @Override + public ResultData getVolumeOfWeek(Long userId) { + + WxMerchantBUser user = wxMerchantBUserService.getById(userId); + + if (user==null) + return new ResultData(ErrorCode.USER_IS_EMPTY); + + WxMerchant merchant = wxMerchantService.getById(user.getMerchantId()); + + if (merchant==null) + return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); + + WxMall mall = wxMallService.getByTenantId(merchant.getTenantId()); + if (mall==null) + return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); + + + WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); + + wxMerchantTradeDaily.setMerchantId(merchant.getId()); + + SimpleDateFormat fmt=new SimpleDateFormat("yyyy-MM-dd"); + wxMerchantTradeDaily.setReportDate(fmt.format(new Date())); + + + List tradeList = wxMerchantTradeDailyMapper.findListOfWeek(wxMerchantTradeDaily); + + if (tradeList.size() > 0 ) { + return new ResultData(tradeList); + } + + return new ResultData(ErrorCode.DALIY_REPORT_VOLUME_WEEK_NULL); + + } diff --git a/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml index 2ca6a11f3..6675ec93b 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml @@ -63,8 +63,24 @@ select from wx_merchant_trade_daily - - + + From 3827cba914063eb7f365cb7f80aa17f9cf2abbc5 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 23 Aug 2018 17:38:11 +0800 Subject: [PATCH 05/58] =?UTF-8?q?[=E5=95=86=E9=93=BA=E5=95=86=E6=88=B7][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E6=9F=A5=E8=AF=A2=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=EF=BC=8Cbuilding=E3=80=81floor=E5=AD=97=E6=AE=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DataTowerController.java | 94 +++++ .../controller/WxMerchantController.java | 1 + .../simple/controller/WxShopController.java | 4 +- .../java/com/simple/domain/po/WxShop.java | 12 +- .../java/com/simple/mapper/WxShopMapper.java | 13 +- .../com/simple/service/WxShopService.java | 4 +- .../service/impl/WxShopServiceImpl.java | 8 + .../main/resources/mapper/WxShopMapper.xml | 342 +++++++++++------- 8 files changed, 341 insertions(+), 137 deletions(-) create mode 100644 mallinkAdmin/src/main/java/com/simple/controller/DataTowerController.java diff --git a/mallinkAdmin/src/main/java/com/simple/controller/DataTowerController.java b/mallinkAdmin/src/main/java/com/simple/controller/DataTowerController.java new file mode 100644 index 000000000..95b6d2847 --- /dev/null +++ b/mallinkAdmin/src/main/java/com/simple/controller/DataTowerController.java @@ -0,0 +1,94 @@ +package com.simple.controller; + +import com.simple.common.ResultData; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.log4j.Logger; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.ArrayList; +import java.util.List; + +@Api(description = "数据塔台") +@RestController +@RequestMapping("datatower") +public class DataTowerController extends BaseController { + + + private Logger logger = Logger.getLogger(DataTowerController.class); + + + @ApiOperation("查询客流") + @PostMapping("/queryCustomer") + public ResultData queryCustomer() { + + List series = new ArrayList<>(); + + List seriesdata = new ArrayList<>(); + seriesdata.add(1); + seriesdata.add(2); + seriesdata.add(3); + seriesdata.add(4); + seriesdata.add(5); + seriesdata.add(6); + seriesdata.add(7); + seriesdata.add(8); + seriesdata.add(9); + seriesdata.add(10); + seriesdata.add(11); + seriesdata.add(12); + seriesdata.add(13); + seriesdata.add(14); + seriesdata.add(15); + seriesdata.add(16); + seriesdata.add(17); + seriesdata.add(18); + series.add(seriesdata); + seriesdata = new ArrayList<>(); + seriesdata.add(10); + seriesdata.add(20); + seriesdata.add(30); + seriesdata.add(40); + seriesdata.add(50); + seriesdata.add(60); + seriesdata.add(70); + seriesdata.add(80); + seriesdata.add(90); + seriesdata.add(100); + seriesdata.add(110); + seriesdata.add(120); + seriesdata.add(130); + seriesdata.add(140); + seriesdata.add(150); + seriesdata.add(160); + seriesdata.add(170); + seriesdata.add(180); + series.add(seriesdata); + seriesdata = new ArrayList<>(); + seriesdata.add(100); + seriesdata.add(200); + seriesdata.add(300); + seriesdata.add(400); + seriesdata.add(500); + seriesdata.add(600); + seriesdata.add(700); + seriesdata.add(800); + seriesdata.add(900); + seriesdata.add(1000); + seriesdata.add(1100); + seriesdata.add(1200); + seriesdata.add(1300); + seriesdata.add(1400); + seriesdata.add(1500); + seriesdata.add(1600); + seriesdata.add(1700); + seriesdata.add(1800); + series.add(seriesdata); + + return new ResultData(series); + } + + +} diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java index 5f53b334a..2d9e31e61 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java @@ -29,6 +29,7 @@ public class WxMerchantController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxMerchant wxMerchant, Integer pageNum, Integer pageSize) { if (null == wxMerchant) wxMerchant = new WxMerchant(); + wxMerchant.setTenantId(getTenantId()); final PageInfo page = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java index 670a55d95..aba2ccfc8 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java @@ -13,6 +13,8 @@ import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.Map; + @RestController @RequestMapping("wxShop") public class WxShopController extends BaseController @@ -29,7 +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(); - final PageInfo page = wxShopService.listAsPage(wxShop, pageNum, pageSize); + final PageInfo> page = wxShopService.listMapAsPage(wxShop, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxShop.java b/mallinkService/src/main/java/com/simple/domain/po/WxShop.java index fc1588d4c..02faf6fde 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxShop.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxShop.java @@ -55,10 +55,10 @@ public class WxShop implements Serializable { private String operationArea; /*楼座号**/ @io.swagger.annotations.ApiModelProperty(value="楼座号",name="building") - private String building; + private Long building; /*楼层号**/ @io.swagger.annotations.ApiModelProperty(value="楼层号",name="floor") - private Integer floor; + private Long floor; /*状态(0:未出租, 1:已出租)**/ @io.swagger.annotations.ApiModelProperty(value="状态(0:未出租, 1:已出租)",name="status") private Integer status; @@ -114,16 +114,16 @@ public class WxShop implements Serializable { public void setOperationArea(String _operationArea) { operationArea = _operationArea; } - public String getBuilding() { + public Long getBuilding() { return building; } - public void setBuilding(String _building) { + public void setBuilding(Long _building) { building = _building; } - public Integer getFloor() { + public Long getFloor() { return floor; } - public void setFloor(Integer _floor) { + public void setFloor(Long _floor) { floor = _floor; } public Integer getStatus() { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxShopMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxShopMapper.java index 3db1381d5..0826f98a0 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxShopMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxShopMapper.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.WxShop; +import java.util.List; +import java.util.Map; + public interface WxShopMapper extends CommonMapper { List findList(WxShop wxShop); - - - - - + + List> findListMap(WxShop record); + } diff --git a/mallinkService/src/main/java/com/simple/service/WxShopService.java b/mallinkService/src/main/java/com/simple/service/WxShopService.java index 60e56ed3f..5d4ea485f 100644 --- a/mallinkService/src/main/java/com/simple/service/WxShopService.java +++ b/mallinkService/src/main/java/com/simple/service/WxShopService.java @@ -15,7 +15,9 @@ public interface WxShopService { * @return */ PageInfo listAsPage(WxShop record, Integer pageIndex, Integer pageSize); - + + PageInfo> listMapAsPage(WxShop record, Integer pageIndex, Integer pageSize); + /** * 根据Id获得实体 * 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 a431bbdf8..e8742fe88 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxShopServiceImpl.java @@ -22,6 +22,14 @@ public class WxShopServiceImpl implements WxShopService { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxShopMapper.findList(record)); } + @Override + public PageInfo> listMapAsPage(WxShop record, Integer pageIndex, Integer pageSize) { + List> shops = wxShopMapper.findListMap(record); + PageHelper.startPage(pageIndex, pageSize); + PageInfo> pageInfo = new PageInfo<>(shops); + return pageInfo; + } + @Override public WxShop getById(Long id) { return wxShopMapper.selectByPrimaryKey(id); diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index 498e7c912..d595a8d49 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -1,130 +1,228 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + `id`,`tenant_id`,`shop_number`,`build_area`,`operation_area`,`building`,`floor`,`status`,`x`,`y`,`addr`,`baidu_poi`,`longitude`,`latitude`,`create_date`,`update_date`,`img_url` - - where 1 = 1 - - - and `id` = #{id} - - - - - and `tenant_id` like concat('%', #{tenantId},'%') - - - - - and `shop_number` like concat('%', #{shopNumber},'%') - - - - - and `build_area` like concat('%', #{buildArea},'%') - - - - - and `operation_area` like concat('%', #{operationArea},'%') - - - - - and `building` like concat('%', #{building},'%') - - - - - and `floor` = #{floor} - - - - - and `status` = #{status} - - - - - and `x` = #{x} - - - - - and `y` = #{y} - - - - - and `addr` like concat('%', #{addr},'%') - - - - - and `baidu_poi` like concat('%', #{baiduPoi},'%') - - - - - and `longitude` = #{longitude} - - - - - and `latitude` = #{latitude} - - - - - and `create_date` = #{createDate} - - - - - and `update_date` = #{updateDate} - - - - and id in - - #{idItem} - - - order by ${sortColumns} - - - + select + + from wx_shop + + + + - - - - - - + + From 0b04d8143448f0beb94a5a139ad5f0f485315edb Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Thu, 23 Aug 2018 19:34:08 +0800 Subject: [PATCH 06/58] =?UTF-8?q?[=E6=89=8B=E6=9C=BA=E5=8F=B7=E9=AA=8C?= =?UTF-8?q?=E8=AF=81][=E6=96=B0=E5=A2=9E]:c=E7=AB=AF=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxMsgValidationcodeController.java | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxMsgValidationcodeController.java b/mallinkCApi/src/main/java/com/simple/controller/WxMsgValidationcodeController.java index 43907885d..766ae4d0f 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxMsgValidationcodeController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxMsgValidationcodeController.java @@ -1,6 +1,7 @@ package com.simple.controller; import com.simple.common.ResultData; +import com.simple.domain.po.WxCUser; import com.simple.domain.po.WxMsgValidationcode; import com.simple.service.WxMerchantBUserService; import com.simple.service.WxMerchantService; @@ -33,34 +34,31 @@ 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) { - + @ApiImplicitParam(name = "type", value = "场景", dataType = "Integer", paramType = "query", required = true)}) + public ResultData sendvalidationcode(String phone, Integer type) { + WxCUser user = getUser(); WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); - wxMsgValidationcode.setTenantId(tenantId); + wxMsgValidationcode.setTenantId(user.getTenantId()); wxMsgValidationcode.setPhone(phone); wxMsgValidationcode.setType(type); - wxMsgValidationcode.setAppid(appid); + wxMsgValidationcode.setAppid(user.getAppId()); return wxMsgValidationcodeService.sendvalidationcode(wxMsgValidationcode); } @GetMapping("hasvalidationcode") @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 = "code", value = "验证码", dataType = "String", paramType = "query", required = true), - @ApiImplicitParam(name = "appid", value = "appid", dataType = "String", paramType = "query", required = true)}) - public ResultData hasvalidationcode(String tenantId, String phone, Integer type, String code, String appid) { + @ApiImplicitParam(name = "code", value = "验证码", dataType = "String", paramType = "query", required = true)}) + public ResultData hasvalidationcode(String phone, Integer type, String code) { + WxCUser user = getUser(); WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); - wxMsgValidationcode.setTenantId(tenantId); + wxMsgValidationcode.setTenantId(user.getTenantId()); wxMsgValidationcode.setPhone(phone); wxMsgValidationcode.setType(type); wxMsgValidationcode.setCode(code); - wxMsgValidationcode.setAppid(appid); + wxMsgValidationcode.setAppid(user.getAppId()); return wxMsgValidationcodeService.hasvalidationcode(wxMsgValidationcode); } From c34a549ce4f438c688ae349d389146ddad0da3e6 Mon Sep 17 00:00:00 2001 From: "jinguo24@163.com" Date: Thu, 23 Aug 2018 21:03:40 +0800 Subject: [PATCH 07/58] =?UTF-8?q?[=E7=AD=89=E7=BA=A7=E6=9D=83=E7=9B=8A][?= =?UTF-8?q?=E6=96=B0=E5=A2=9E]=E7=AD=89=E7=BA=A7=E6=9D=83=E7=9B=8A?= =?UTF-8?q?=E5=92=8C=E8=A7=84=E5=88=99=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxLevelConfigController.java | 78 +++++++++ .../controller/WxScoreRulesController.java | 6 +- .../com/simple/domain/po/WxLevelConfig.java | 152 ++++++++++++++++++ .../com/simple/domain/po/WxScoreRules.java | 33 +++- .../simple/mapper/WxLevelConfigMapper.java | 17 ++ .../simple/service/WxLevelConfigService.java | 48 ++++++ .../impl/WxLevelConfigServiceImpl.java | 54 +++++++ .../resources/mapper/WxLevelConfigMapper.xml | 68 ++++++++ .../resources/mapper/WxScoreRulesMapper.xml | 16 +- 9 files changed, 463 insertions(+), 9 deletions(-) create mode 100644 mallinkAdmin/src/main/java/com/simple/controller/WxLevelConfigController.java create mode 100644 mallinkService/src/main/java/com/simple/domain/po/WxLevelConfig.java create mode 100644 mallinkService/src/main/java/com/simple/mapper/WxLevelConfigMapper.java create mode 100644 mallinkService/src/main/java/com/simple/service/WxLevelConfigService.java create mode 100644 mallinkService/src/main/java/com/simple/service/impl/WxLevelConfigServiceImpl.java create mode 100644 mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxLevelConfigController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxLevelConfigController.java new file mode 100644 index 000000000..c13f11c56 --- /dev/null +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxLevelConfigController.java @@ -0,0 +1,78 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; +import com.simple.domain.po.WxLevelConfig; +import com.simple.service.WxLevelConfigService; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxLevelConfig") +@Api(description="等级权益相关接口") +public class WxLevelConfigController extends BaseController +{ + @Autowired + private WxLevelConfigService wxLevelConfigService; + + private Logger logger = Logger.getLogger(WxLevelConfigController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxLevelConfig wxLevelConfig,Integer pageNum, Integer pageSize) { + if (null == wxLevelConfig) wxLevelConfig = new WxLevelConfig(); + final PageInfo page = wxLevelConfigService.listAsPage(wxLevelConfig, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxLevelConfig wxLevelConfig) { + //Assert.notNull(wxLevelConfig.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxLevelConfig.setTenantId(getTenantId()); + wxLevelConfigService.saveOrUpdate(wxLevelConfig); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxLevelConfig wxLevelConfig) { + wxLevelConfigService.saveOrUpdate(wxLevelConfig); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxLevelConfigService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxLevelConfigService.getById(id)); + } + + + +} diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxScoreRulesController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxScoreRulesController.java index 21cb402b7..d0a55cf75 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxScoreRulesController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxScoreRulesController.java @@ -11,12 +11,15 @@ import com.simple.common.ResultData; import com.simple.domain.po.WxScoreRules; import com.simple.service.WxScoreRulesService; + +import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @RestController @RequestMapping("wxScoreRules") +@Api(description="成长值规则相关接口") public class WxScoreRulesController extends BaseController { @Autowired @@ -40,7 +43,8 @@ public class WxScoreRulesController extends BaseController public ResultData add(@RequestBody WxScoreRules wxScoreRules) { //Assert.notNull(wxScoreRules.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxScoreRulesService.saveOrUpdate(wxScoreRules); + wxScoreRules.setTenantId(getTenantId()); + wxScoreRulesService.saveOrUpdate(wxScoreRules); return new ResultData(); } diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxLevelConfig.java b/mallinkService/src/main/java/com/simple/domain/po/WxLevelConfig.java new file mode 100644 index 000000000..0a0c1d73f --- /dev/null +++ b/mallinkService/src/main/java/com/simple/domain/po/WxLevelConfig.java @@ -0,0 +1,152 @@ +package com.simple.domain.po; + +import javax.persistence.*; +import java.util.*; +import java.math.*; +import javax.persistence.Transient; +import java.util.List; +import javax.persistence.Id; +import java.io.Serializable; + +@Table(name = "wx_level_config") +public class WxLevelConfig implements Serializable { + private static final long serialVersionUID = 1L; + + @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="points") + private Integer points; + /*等级**/ + @io.swagger.annotations.ApiModelProperty(value="等级",name="level") + private String level; + /*描述**/ + @io.swagger.annotations.ApiModelProperty(value="描述",name="description") + private String description; + /*创建时间**/ + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") + private Date createDate; + /*租户id**/ + @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") + private String tenantId; + public Integer getPoints() { + return points; + } + public void setPoints(Integer _points) { + points = _points; + } + public String getLevel() { + return level; + } + public void setLevel(String _level) { + level = _level; + } + public String getDescription() { + return description; + } + public void setDescription(String _description) { + description = _description; + } + public Date getCreateDate() { + return createDate; + } + public void setCreateDate(Date _createDate) { + createDate = _createDate; + } + public String getTenantId() { + return tenantId; + } + public void setTenantId(String _tenantId) { + tenantId = _tenantId; + } + + + + public static enum Field + { + Id_ASC("`id` ASC"),Id_DESC("`id` DESC") + ,Points_ASC("`points` ASC"),Points_DESC("`points` DESC") + ,Level_ASC("`level` ASC"),Level_DESC("`level` DESC") + ,Description_ASC("`description` ASC"),Description_DESC("`description` DESC") + ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") + ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` 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(WxLevelConfig.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(Field.valueOf(cols[k])); + } + this.setSortColumns(fList.toArray(new Field[fList.size()])); + } else { + this.setSortColumns(Field.valueOf(sortColumns)); + } + } +} diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxScoreRules.java b/mallinkService/src/main/java/com/simple/domain/po/WxScoreRules.java index 38d941e72..10130df81 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxScoreRules.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxScoreRules.java @@ -16,7 +16,7 @@ public class WxScoreRules implements Serializable { protected Long id; @Transient - protected List ids; + protected List ids; @Transient protected String sortColumns; @@ -32,10 +32,11 @@ public class WxScoreRules implements Serializable { return sortColumns; } - public List getIds() { + public List getIds() { return ids; } - public void setIds(List ids) { + + public void setIds(List ids) { this.ids = ids; } @@ -46,7 +47,7 @@ public class WxScoreRules implements Serializable { private String tenantId; /*消费金额**/ @io.swagger.annotations.ApiModelProperty(value="消费金额",name="consumptionAmount") - private BigDecimal consumptionAmount; + private Integer consumptionAmount; /*获取积分**/ @io.swagger.annotations.ApiModelProperty(value="获取积分",name="scoreNumber") private Integer scoreNumber; @@ -56,16 +57,22 @@ public class WxScoreRules implements Serializable { /*更新时间**/ @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; + /*登录次数**/ + @io.swagger.annotations.ApiModelProperty(value="登录次数",name="loginCount") + private Integer loginCount; + /*类型:0 消费金额 1登录次数**/ + @io.swagger.annotations.ApiModelProperty(value="类型:0 消费金额 1登录次数",name="type") + private Integer type; public String getTenantId() { return tenantId; } public void setTenantId(String _tenantId) { tenantId = _tenantId; } - public BigDecimal getConsumptionAmount() { + public Integer getConsumptionAmount() { return consumptionAmount; } - public void setConsumptionAmount(BigDecimal _consumptionAmount) { + public void setConsumptionAmount(Integer _consumptionAmount) { consumptionAmount = _consumptionAmount; } public Integer getScoreNumber() { @@ -86,6 +93,18 @@ public class WxScoreRules implements Serializable { public void setUpdateDate(Date _updateDate) { updateDate = _updateDate; } + public Integer getLoginCount() { + return loginCount; + } + public void setLoginCount(Integer _loginCount) { + loginCount = _loginCount; + } + public Integer getType() { + return type; + } + public void setType(Integer _type) { + type = _type; + } @@ -97,6 +116,8 @@ public class WxScoreRules implements Serializable { ,ScoreNumber_ASC("`scoreNumber` ASC"),ScoreNumber_DESC("`scoreNumber` DESC") ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC") + ,LoginCount_ASC("`loginCount` ASC"),LoginCount_DESC("`loginCount` DESC") + ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") ; private String value; Field(String value){ diff --git a/mallinkService/src/main/java/com/simple/mapper/WxLevelConfigMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxLevelConfigMapper.java new file mode 100644 index 000000000..fba1afb2a --- /dev/null +++ b/mallinkService/src/main/java/com/simple/mapper/WxLevelConfigMapper.java @@ -0,0 +1,17 @@ +package com.simple.mapper; + +import java.util.*; +import com.simple.common.CommonMapper; +import org.apache.ibatis.annotations.Param; +import com.simple.domain.po.WxLevelConfig; + +public interface WxLevelConfigMapper extends CommonMapper { + + List findList(WxLevelConfig wxLevelConfig); + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/WxLevelConfigService.java b/mallinkService/src/main/java/com/simple/service/WxLevelConfigService.java new file mode 100644 index 000000000..dc3771151 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/WxLevelConfigService.java @@ -0,0 +1,48 @@ +package com.simple.service; + +import java.util.*; +import com.github.pagehelper.PageInfo; +import com.simple.domain.po.WxLevelConfig; + +public interface WxLevelConfigService { + + /** + * 根据实体查询分页列表 + * + * @param record + * @param offset + * @param limit + * @return + */ + PageInfo listAsPage(WxLevelConfig record, Integer pageIndex, Integer pageSize); + + /** + * 根据Id获得实体 + * + * @param id + * @return + */ + WxLevelConfig getById(Long id); + + /** + * 保存或更新实体 + * + * @param record + */ + void saveOrUpdate(WxLevelConfig record); + + /** + * 根据Id删除实体 + * + * @param id + */ + void deleteById(Long id); + + + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxLevelConfigServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxLevelConfigServiceImpl.java new file mode 100644 index 000000000..87f991409 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/impl/WxLevelConfigServiceImpl.java @@ -0,0 +1,54 @@ +package com.simple.service.impl; + +import java.util.*; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.simple.domain.po.WxLevelConfig; +import com.simple.mapper.WxLevelConfigMapper; +import com.simple.service.WxLevelConfigService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.simple.common.IdWorker; + +@Service +public class WxLevelConfigServiceImpl implements WxLevelConfigService { + + @Autowired + WxLevelConfigMapper wxLevelConfigMapper; + + + @Override + public PageInfo listAsPage(WxLevelConfig record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxLevelConfigMapper.findList(record)); + } + + @Override + public WxLevelConfig getById(Long id) { + return wxLevelConfigMapper.selectByPrimaryKey(id); + } + + @Override + public void saveOrUpdate(WxLevelConfig record) { + if (record.getId() == null) { + //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); + IdWorker idWorker = new IdWorker(0, 0); + record.setId(idWorker.nextId()); + wxLevelConfigMapper.insertSelective(record); + } else { + wxLevelConfigMapper.updateByPrimaryKeySelective(record); + } + } + + @Override + public void deleteById(Long id) { + wxLevelConfigMapper.deleteByPrimaryKey(id); + } + + + + + + + + +} diff --git a/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml new file mode 100644 index 000000000..8daad3625 --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + `id`,`points`,`level`,`description`,`create_date`,`tenant_id` + + + + where 1 = 1 + + + and `id` = #{id} + + + + + and `points` = #{points} + + + + + and `level` like concat('%', #{level},'%') + + + + + and `description` like concat('%', #{description},'%') + + + + + and `create_date` = #{createDate} + + + + + and `tenant_id` like concat('%', #{tenantId},'%') + + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + + + + + diff --git a/mallinkService/src/main/resources/mapper/WxScoreRulesMapper.xml b/mallinkService/src/main/resources/mapper/WxScoreRulesMapper.xml index 33fcb7411..9056f9221 100644 --- a/mallinkService/src/main/resources/mapper/WxScoreRulesMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxScoreRulesMapper.xml @@ -4,14 +4,16 @@ - + + + - `id`,`tenant_id`,`consumption_amount`,`score_number`,`create_date`,`update_date` + `id`,`tenant_id`,`consumption_amount`,`score_number`,`create_date`,`update_date`,`login_count`,`type` @@ -45,6 +47,16 @@ and `update_date` = #{updateDate} + + + + and `login_count` = #{loginCount} + + + + + and `type` = #{type} + and id in From 23c298d2d66637d360b6c5caa8cdfc239b657105 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Thu, 23 Aug 2018 21:43:48 +0800 Subject: [PATCH 08/58] =?UTF-8?q?[c=E7=AB=AF=E4=B8=9A=E6=80=81][=E6=96=B0?= =?UTF-8?q?=E5=A2=9E]:c=E7=AB=AF=E6=89=8B=E4=B8=9A=E6=80=81=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxBusinessController.java | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxBusinessController.java diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxBusinessController.java b/mallinkCApi/src/main/java/com/simple/controller/WxBusinessController.java new file mode 100644 index 000000000..45ee71cd7 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxBusinessController.java @@ -0,0 +1,36 @@ +package com.simple.controller; + +import com.github.pagehelper.PageInfo; +import com.simple.common.ResultData; +import com.simple.domain.po.WxBusiness; +import com.simple.domain.po.WxCUser; +import com.simple.service.WxBusinessService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/api/wxBusiness") +public class WxBusinessController extends BaseController +{ + private Logger logger = Logger.getLogger(WxBusinessController.class); + + @Autowired + private WxBusinessService wxBusinessService; + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(WxBusiness wxBusiness,Integer pageNum, Integer pageSize) { + if (null == wxBusiness) wxBusiness = new WxBusiness(); + WxCUser user = getUser(); + wxBusiness.setTenantId(user.getTenantId()); + final PageInfo page = wxBusinessService.listAsPage(wxBusiness, pageNum, pageSize); + return new ResultData(page); + } +} From 29403cf2e2181c14ba86adfdcbdf858420e5a7ec Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Thu, 23 Aug 2018 21:44:14 +0800 Subject: [PATCH 09/58] =?UTF-8?q?[c=E7=AB=AF=E4=B8=9A=E6=80=81][=E6=96=B0?= =?UTF-8?q?=E5=A2=9E]:c=E7=AB=AF=E6=89=8B=E4=B8=9A=E6=80=81=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxBusinessController.java | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxBusinessController.java b/mallinkCApi/src/main/java/com/simple/controller/WxBusinessController.java index 45ee71cd7..b5b3b1d44 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxBusinessController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxBusinessController.java @@ -10,24 +10,25 @@ import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/api/wxBusiness") -public class WxBusinessController extends BaseController -{ +public class WxBusinessController extends BaseController { private Logger logger = Logger.getLogger(WxBusinessController.class); - @Autowired + @Autowired private WxBusinessService wxBusinessService; - - @ApiOperation("分页列表接口") + + @ApiOperation("分页列表接口") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(WxBusiness wxBusiness,Integer pageNum, Integer pageSize) { - if (null == wxBusiness) wxBusiness = new WxBusiness(); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(WxBusiness wxBusiness, Integer pageNum, Integer pageSize) { + if (null == wxBusiness) wxBusiness = new WxBusiness(); WxCUser user = getUser(); wxBusiness.setTenantId(user.getTenantId()); final PageInfo page = wxBusinessService.listAsPage(wxBusiness, pageNum, pageSize); From 1ac998b832ff3bf7da19995e0c40c8d1996d21b0 Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 23 Aug 2018 22:32:01 +0800 Subject: [PATCH 10/58] =?UTF-8?q?[B=E7=AB=AF][=E6=B7=BB=E5=8A=A0]:?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=95=E6=97=A5=E4=BA=A4=E6=98=93,?= =?UTF-8?q?=E6=A0=B8=E9=94=80,=E6=80=BB=E9=A2=9D,=E6=B5=81=E6=B0=B4?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCouponOrderController.java | 76 ++++++++++++---- .../java/com/simple/common/ErrorCode.java | 2 +- .../simple/mapper/WxCouponOrderMapper.java | 2 +- .../simple/schedule/DaliyAmountSchedule.java | 2 +- .../simple/service/WxCouponOrderService.java | 18 ++-- .../impl/WxCouponOrderServiceImpl.java | 87 +++++++++++++++++-- .../resources/mapper/WxCouponOrderMapper.xml | 28 +++--- 7 files changed, 174 insertions(+), 41 deletions(-) diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java index a7189bb1e..59f1d9e1c 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java @@ -28,6 +28,65 @@ public class WxCouponOrderController extends BaseController { @Autowired private WxCouponOrderService wxCouponOrderService; + + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxCouponOrder wxCouponOrder, Integer pageNum, Integer pageSize) { + if (null == wxCouponOrder) wxCouponOrder = new WxCouponOrder(); + final PageInfo page = wxCouponOrderService.listAsPage(wxCouponOrder, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxCouponOrder wxCouponOrder) { + wxCouponOrderService.saveOrUpdate(wxCouponOrder); + return new ResultData(); + } + + + + @ApiOperation("交易流水分页列表接口") + @GetMapping("listUnverified") + @ApiImplicitParams({ + @ApiImplicitParam(name = "date", value = "日期yyyy-MM-dd", dataType = "string", paramType = "query"), + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query",required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query",required = true)}) + public ResultData listUnverified(String date, Integer pageNum, Integer pageSize) { + return wxCouponOrderService.listOnDateAsPage(getUser().getId(), date, pageNum, pageSize, false); + } + + @ApiOperation("核销流水分页列表接口") + @GetMapping("listVerified") + @ApiImplicitParams({ + @ApiImplicitParam(name = "date", value = "日期yyyy-MM-dd", dataType = "string", paramType = "query"), + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query",required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query",required = true)}) + public ResultData listVerified(String date, Integer pageNum, Integer pageSize) { + return wxCouponOrderService.listOnDateAsPage(getUser().getId(), date, pageNum, pageSize, true); + } + + + @ApiOperation("某日期交易总流水") + @GetMapping("getUnverifiedAmountOnDate") + @ApiImplicitParams({ + @ApiImplicitParam(name = "date", value = "日期yyyy-MM-dd", dataType = "string", paramType = "query")}) + public ResultData getUnverifiedAmountOnDate(String date) { + return wxCouponOrderService.listOnDateAsPage(getUser().getId(), date, null, null, false); + } + + @ApiOperation("某日期核销总流水") + @GetMapping("getVerifiedAmountOnDate") + @ApiImplicitParams({ + @ApiImplicitParam(name = "date", value = "日期yyyy-MM-dd", dataType = "string", paramType = "query")}) + public ResultData getVerifiedAmountOnDate(String date) { + return wxCouponOrderService.listOnDateAsPage(getUser().getId(), date, null, null, true); + } + @ApiOperation(value = "核销接口", notes = "{\"couponOrderId\":\"string\"}") @PostMapping("verify") public ResultData verify(@RequestBody Map paramMap) { @@ -85,23 +144,6 @@ public class WxCouponOrderController extends BaseController { } } - @ApiOperation("分页列表接口") - @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), - @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - public ResultData list(@ModelAttribute WxCouponOrder wxCouponOrder, Integer pageNum, Integer pageSize) { - if (null == wxCouponOrder) wxCouponOrder = new WxCouponOrder(); - final PageInfo page = wxCouponOrderService.listAsPage(wxCouponOrder, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxCouponOrder wxCouponOrder) { - wxCouponOrderService.saveOrUpdate(wxCouponOrder); - return new ResultData(); - } @ApiOperation(value = "根据couponOrderId查询接口", notes = "{\"couponOrderId\":\"string\"}") @PostMapping("/findById") diff --git a/mallinkService/src/main/java/com/simple/common/ErrorCode.java b/mallinkService/src/main/java/com/simple/common/ErrorCode.java index 4bc398383..9eb70dd63 100644 --- a/mallinkService/src/main/java/com/simple/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/simple/common/ErrorCode.java @@ -157,7 +157,7 @@ public enum ErrorCode{ * 解单 */ DALIY_REPORT_VOLUME_TODAY_NULL(12070, "今日解单不存在"), - DALIY_REPORT_VOLUME_WEEK_NULL(12070, "无解单数据") + DALIY_REPORT_VOLUME_WEEK_NULL(12071, "无解单数据") ; diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java index 2ab4a7b63..27ca8c17a 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java @@ -9,7 +9,7 @@ public interface WxCouponOrderMapper extends CommonMapper { List findList(WxCouponOrder wxCouponOrder); - List findListOfOrderedByDate(Map dateMap); + List findListOfUnverifiedByDate(Map dateMap); List findListOfVerifiedByDate(Map dateMap); } diff --git a/mallinkService/src/main/java/com/simple/schedule/DaliyAmountSchedule.java b/mallinkService/src/main/java/com/simple/schedule/DaliyAmountSchedule.java index 951a531c0..2bc4b4550 100644 --- a/mallinkService/src/main/java/com/simple/schedule/DaliyAmountSchedule.java +++ b/mallinkService/src/main/java/com/simple/schedule/DaliyAmountSchedule.java @@ -80,7 +80,7 @@ public class DaliyAmountSchedule { dateMap.put("endDate", new Date()); dateMap.put("merchantID",merchant.getId()); - List list = wxCouponOrderMapper.findListOfOrderedByDate(dateMap); + List list = wxCouponOrderMapper.findListOfUnverifiedByDate(dateMap); logger.info("find " + list.size() + " coupon order from " + startDate + " to " + new Date()); int total_price = 0; for(WxCouponOrder couponOrder : list) { diff --git a/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java b/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java index c54954ba4..a59286186 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java @@ -1,6 +1,8 @@ package com.simple.service; import java.util.*; + +import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.simple.common.ResultData; import com.simple.domain.po.MallUserInfo; @@ -62,10 +64,16 @@ public interface WxCouponOrderService { * @param bUserId 退券(款)人(登录用户) */ ResultData refund(Long couponOrderId, Long bUserId); - - - - - + + /** + * 根据日期 b用户查券list + * + * @param bUserId 退券(款)人(登录用户) + */ + + ResultData listOnDateAsPage(Long bUserId, String date, Integer pageIndex, Integer pageSize, boolean isVerified); + + + } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java index 691757aee..910b6a00c 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java @@ -6,13 +6,11 @@ import com.simple.common.ErrorCode; import com.simple.common.IdWorker; import com.simple.common.Result; import com.simple.common.ResultData; -import com.simple.domain.po.MallUserInfo; -import com.simple.domain.po.WxCouponOrder; -import com.simple.domain.po.WxMerchantBUser; -import com.simple.domain.po.WxOrder; +import com.simple.domain.po.*; import com.simple.enums.EnumCouponOrderStatus; import com.simple.enums.EnumCouponStatus; import com.simple.exception.MallinkException; +import com.simple.mapper.WxMerchantMapper; import com.simple.mapper.WxOrderMapper; import com.simple.mapper.WxCouponOrderMapper; import com.simple.mapper.WxMerchantBUserMapper; @@ -23,7 +21,9 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; @Service public class WxCouponOrderServiceImpl implements WxCouponOrderService { @@ -35,6 +35,9 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { @Autowired WxOrderMapper wxOrderMapper; + @Autowired + WxMerchantMapper wxMerchantMapper; + @Autowired WxMerchantBUserMapper wxMerchantBUserMapper; @@ -74,6 +77,80 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } + + @Override + public ResultData listOnDateAsPage(Long bUserId, String date, Integer pageIndex, Integer pageSize, boolean isVerified) { + + WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectByPrimaryKey(bUserId.longValue()); + if (wxMerchantBUser == null) { + logger.error("核销员不存在:" + bUserId); + throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND); + } + + WxMerchant wxMerchant = wxMerchantMapper.selectByPrimaryKey(wxMerchantBUser.getMerchantId()); + if (wxMerchant == null) { + logger.error("商户不存在:" + bUserId); + throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND); + } + + + SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); + String dateString; + Date startDate; + Date endDate; + + if (date == null) { + endDate = new Date(); + dateString = fmt.format(new Date()); + try { + startDate = fmt.parse(dateString); + } catch (ParseException e) { + return new ResultData(ErrorCode.SYS_PARAMETER_CAST_ERROR); + } + } + else { + try { + startDate = fmt.parse(date); + } catch (ParseException e) { + return new ResultData(ErrorCode.SYS_PARAMETER_CAST_ERROR); + } + Calendar cal = Calendar.getInstance(); + cal.setTime(startDate); + cal.add(Calendar.DATE,1); + endDate = cal.getTime(); + } + + Map dateMap = new HashMap(); + dateMap.put("startDate", startDate); + dateMap.put("endDate", endDate); + dateMap.put("merchantID", wxMerchant.getId()); + + Map resultMap = new HashMap(); + + if (pageIndex == null || pageSize == null) { + List list; + if(isVerified) + list = wxCouponOrderMapper.findListOfVerifiedByDate(dateMap); + else + list = wxCouponOrderMapper.findListOfUnverifiedByDate(dateMap); + logger.info("find " + list.size() + " coupon order from " + startDate + " to " + new Date()); + int total_price = 0; + for (WxCouponOrder couponOrder : list) { + total_price = total_price + couponOrder.getCouponPrice(); + } + resultMap.put("amount", total_price); + } + else { + if (isVerified) + resultMap.put("list", PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfVerifiedByDate(dateMap))); + else + resultMap.put("list", PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfUnverifiedByDate(dateMap))); + } + return new ResultData(resultMap); + } + + + @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public ResultData verify(Long couponOrderId, Long bUserId) { diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 56d885eeb..d20727c21 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -90,21 +90,26 @@ - + select from wx_coupon_order c,wx_order o + where o.id = c.order_id and o.merchant_id = #{merchantID} + + AND c.create_date > #{startDate,jdbcType=TIMESTAMP} + + + AND c.create_date < #{endDate,jdbcType=TIMESTAMP} + + AND c.coupon_order_status = '0' + From 29f89c70255478e3dd4768f9be031f37a562308c Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Fri, 24 Aug 2018 11:34:09 +0800 Subject: [PATCH 11/58] =?UTF-8?q?[c=E7=AB=AF=E8=BD=A6=E5=9C=BA][=E6=96=B0?= =?UTF-8?q?=E5=A2=9E]:=E8=BD=A6=E5=9C=BA=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/controller/WxCarController.java | 2 +- .../simple/controller/WxParkController.java | 75 ++++++------------- 2 files changed, 23 insertions(+), 54 deletions(-) diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java index 73a77364b..efc2cbcad 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java @@ -29,7 +29,7 @@ import java.util.List; import java.util.Map; @RestController -@RequestMapping("/car") +@RequestMapping("/api/car") public class WxCarController extends BaseController { private Logger logger = Logger.getLogger(WxCarController.class); diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxParkController.java b/mallinkCApi/src/main/java/com/simple/controller/WxParkController.java index 2f7309c99..0027a352f 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxParkController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxParkController.java @@ -1,71 +1,40 @@ package com.simple.controller; -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.ErrorCode; import com.simple.common.Result; import com.simple.common.ResultData; - +import com.simple.domain.po.WxCUser; import com.simple.domain.po.WxPark; +import com.simple.pay.WxPay; import com.simple.service.WxParkService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; @RestController -@RequestMapping("wxPark") -public class WxParkController extends BaseController -{ - @Autowired - private WxParkService wxParkService; - +@RequestMapping("/api/wxPark") +public class WxParkController extends BaseController { private Logger logger = Logger.getLogger(WxParkController.class); - - @ApiOperation("分页列表接口") - @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxPark wxPark,Integer pageNum, Integer pageSize) { - if (null == wxPark) wxPark = new WxPark(); - final PageInfo page = wxParkService.listAsPage(wxPark, pageNum, pageSize); - return new ResultData(page); - } - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxPark wxPark) { - //Assert.notNull(wxPark.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxParkService.saveOrUpdate(wxPark); - return new ResultData(); - } + @Autowired + private WxParkService wxParkService; - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxPark wxPark) { - wxParkService.saveOrUpdate(wxPark); - return new ResultData(); + @ApiOperation("查找用户车场信息") + @GetMapping("/info") + public ResultData findById() { + WxCUser user = getUser(); + WxPark parkQ = new WxPark(); + parkQ.setTenantId(user.getTenantId()); + WxPark park = wxParkService.getByObj(parkQ); + if (park == null) { + logger.error("车场未取到"); + return new ResultData(ErrorCode.CAR_PARK_NOT_FOUND); + } + return new ResultData(Result.SUCCESS, "查询成功", park); } - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData delete(Long id) { - wxParkService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxParkService.getById(id)); - } - - - } From a11acb83766ab5f2e6fc660f8f92d49f137db0d6 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Fri, 24 Aug 2018 14:14:44 +0800 Subject: [PATCH 12/58] =?UTF-8?q?[=E8=BD=A6=E7=89=8C=E7=BB=91=E5=AE=9A][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E7=BB=91=E8=BD=A6=E7=89=8C=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/controller/WxCarController.java | 37 ++++++++++--------- .../com/simple/service/WxCUserCarService.java | 34 ++++++++++++----- .../service/impl/WxCUserCarServiceImpl.java | 11 ++++++ 3 files changed, 56 insertions(+), 26 deletions(-) diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java index efc2cbcad..1c0882d91 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java @@ -261,14 +261,16 @@ public class WxCarController extends BaseController return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "carNumber为空"); } String carNumColor = paramMap.get("carNumColor"); - if (StringUtils.isBlank(carNumColor)) { - logger.error("carNumColor为空"); - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "carNumColor为空"); - } + //if (StringUtils.isBlank(carNumColor)) { + // logger.error("carNumColor为空"); + // return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "carNumColor为空"); + //} + Long newCarId = 0L; String outCarId = paramMap.get("outCarId"); if (StringUtils.isBlank(outCarId)) { - logger.error("outCarId为空"); - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "outCarId为空"); + logger.warn("outCarId为空"); + newCarId = wxCUserCarService.getNewCarID(); + outCarId = String.valueOf(newCarId); } String params = park.getVendorParams(); JSONObject objParams = JSON.parseObject(params); @@ -284,18 +286,19 @@ public class WxCarController extends BaseController String carId = retObj.getString("carId"); // 插入车牌 Date curr = new Date(); + WxCUserCar userCar = new WxCUserCar(); + userCar.setId(newCarId); + userCar.setCUserId(user.getId()); + userCar.setTenantId(user.getTenantId()); + userCar.setCarNumber(carNumber); + userCar.setVendorType(EnumCarVendor.CAR_TJD.getCode()); + JSONObject jo = new JSONObject(); + jo.put("carId", carId); + userCar.setVendorParams(JSON.toJSONString(jo)); + userCar.setCreateDate(curr); + userCar.setUpdateDate(curr); try { - WxCUserCar userCar = new WxCUserCar(); - userCar.setCUserId(user.getId()); - userCar.setTenantId(user.getTenantId()); - userCar.setCarNumber(carNumber); - userCar.setVendorType(EnumCarVendor.CAR_TJD.getCode()); - JSONObject jo = new JSONObject(); - jo.put("carId", carId); - userCar.setVendorParams(JSON.toJSONString(jo)); - userCar.setCreateDate(curr); - userCar.setUpdateDate(curr); - wxCUserCarService.saveOrUpdate(userCar); + wxCUserCarService.save(userCar); } catch (Exception e) { logger.error(e.getMessage()); return new ResultData(ErrorCode.DB_FAIL.getCode(), "TJD保存车牌失败, e:" + e.getMessage()); diff --git a/mallinkService/src/main/java/com/simple/service/WxCUserCarService.java b/mallinkService/src/main/java/com/simple/service/WxCUserCarService.java index 74e00ab3f..f5fa6c2ae 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCUserCarService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCUserCarService.java @@ -1,12 +1,13 @@ package com.simple.service; -import java.util.*; import com.github.pagehelper.PageInfo; import com.simple.domain.po.WxCUserCar; +import java.util.List; + public interface WxCUserCarService { - /** + /** * 根据实体查询分页列表 * * @param record @@ -14,7 +15,7 @@ public interface WxCUserCarService { * @param pageSize * @return */ - PageInfo listAsPage(WxCUserCar record, Integer pageIndex, Integer pageSize); + PageInfo listAsPage(WxCUserCar record, Integer pageIndex, Integer pageSize); /** * 根据实体查询列表 @@ -26,20 +27,34 @@ public interface WxCUserCarService { /** * 根据实体查询 + * * @param record * @return */ WxCUserCar getOne(WxCUserCar record); - - /** + + /** * 根据Id获得实体 * * @param id * @return */ WxCUserCar getById(Long id); - - /** + + + /** + * 获取新的ID + */ + Long getNewCarID(); + + /** + * 保存实体 + * + * @param record + */ + void save(WxCUserCar record); + + /** * 保存或更新实体 * * @param record @@ -55,9 +70,10 @@ public interface WxCUserCarService { /** * 根据WxCUserCar删除实体 + * * @param record */ void deleteByObj(WxCUserCar record); - - + + } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCUserCarServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCUserCarServiceImpl.java index 7dfbc9e19..2cbd529f2 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCUserCarServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCUserCarServiceImpl.java @@ -42,6 +42,17 @@ public class WxCUserCarServiceImpl implements WxCUserCarService { return wxCUserCarMapper.selectByPrimaryKey(id); } + @Override + public Long getNewCarID() { + final IdWorker idWorker = IdWorker.get(); + return idWorker.nextId(); + } + + @Override + public void save(WxCUserCar record) { + wxCUserCarMapper.insertSelective(record); + } + @Override public void saveOrUpdate(WxCUserCar record) { if (record.getId() == null) { From 9140cdd5ad5dbdf90cfd9228c77c1dda626e8a42 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Fri, 24 Aug 2018 14:29:33 +0800 Subject: [PATCH 13/58] =?UTF-8?q?[=E8=BD=A6=E5=9C=BA=E4=BF=A1=E6=81=AF][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E8=BD=A6=E5=9C=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/simple/domain/po/WxPark.java | 15 +++++++++++++-- .../src/main/resources/mapper/WxParkMapper.xml | 14 +++++++++----- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxPark.java b/mallinkService/src/main/java/com/simple/domain/po/WxPark.java index 7a04b90f1..af702a036 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxPark.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxPark.java @@ -54,6 +54,9 @@ public class WxPark implements Serializable { /*出入口数量**/ @io.swagger.annotations.ApiModelProperty(value="出入口数量",name="entryExit") private Integer entryExit; + /*停车费**/ + @io.swagger.annotations.ApiModelProperty(value="停车费",name="stopFee") + private String stopFee; /*创建时间**/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; @@ -93,6 +96,15 @@ public class WxPark implements Serializable { public void setEntryExit(Integer _entryExit) { entryExit = _entryExit; } + + public String getStopFee() { + return stopFee; + } + + public void setStopFee(String _stopFee) { + this.stopFee = _stopFee; + } + public Date getCreateDate() { return createDate; } @@ -124,8 +136,6 @@ public class WxPark implements Serializable { vendorParams = _vendorParams; } - - public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") @@ -133,6 +143,7 @@ public class WxPark implements Serializable { ,Addr_ASC("`addr` ASC"),Addr_DESC("`addr` DESC") ,Number_ASC("`number` ASC"),Number_DESC("`number` DESC") ,EntryExit_ASC("`entryExit` ASC"),EntryExit_DESC("`entryExit` DESC") + ,StopFee_ASC("`stopFee` ASC"),StopFee_DESC("`stopFee` DESC") ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC") ,ParkId_ASC("`parkId` ASC"),ParkId_DESC("`parkId` DESC") diff --git a/mallinkService/src/main/resources/mapper/WxParkMapper.xml b/mallinkService/src/main/resources/mapper/WxParkMapper.xml index 403962394..698df00b1 100644 --- a/mallinkService/src/main/resources/mapper/WxParkMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxParkMapper.xml @@ -7,6 +7,7 @@ + @@ -15,7 +16,7 @@ - `id`,`tenant_id`,`addr`,`number`,`entry_exit`,`create_date`,`update_date`,`park_id`,`vendor_type`,`vendor_params` + `id`,`tenant_id`,`addr`,`number`,`entry_exit`,`stop_fee`,`create_date`,`update_date`,`park_id`,`vendor_type`,`vendor_params` @@ -42,10 +43,13 @@ - and `entry_exit` = #{entryExit} - - - + and `entry_exit` = #{entryExit} + + + + and `stop_fee` = #{stopFee} + + and `create_date` = #{createDate} From 4d3998b89a16487cdfffb3e29defa57c27259558 Mon Sep 17 00:00:00 2001 From: hupeng Date: Fri, 24 Aug 2018 14:43:15 +0800 Subject: [PATCH 14/58] =?UTF-8?q?[C=E7=AB=AF][=E6=B7=BB=E5=8A=A0]:c?= =?UTF-8?q?=E7=AB=AF=E6=B7=BB=E5=8A=A0=E5=88=B8=E5=8C=85=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/vo/{WxUserCouponVo.java => WxCouponOrderBVo.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename mallinkService/src/main/java/com/simple/domain/vo/{WxUserCouponVo.java => WxCouponOrderBVo.java} (71%) diff --git a/mallinkService/src/main/java/com/simple/domain/vo/WxUserCouponVo.java b/mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderBVo.java similarity index 71% rename from mallinkService/src/main/java/com/simple/domain/vo/WxUserCouponVo.java rename to mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderBVo.java index 74c08d0c7..5e55cced1 100644 --- a/mallinkService/src/main/java/com/simple/domain/vo/WxUserCouponVo.java +++ b/mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderBVo.java @@ -2,7 +2,7 @@ package com.simple.domain.vo; import com.simple.domain.po.WxCouponOrder; -public class WxUserCouponVo extends WxCouponOrder{ +public class WxCouponOrderCVo extends WxCouponOrder{ /** * From 26cf8b14db36173594db32949a5cfe43adcad370 Mon Sep 17 00:00:00 2001 From: hupeng Date: Fri, 24 Aug 2018 14:43:42 +0800 Subject: [PATCH 15/58] =?UTF-8?q?[C=E7=AB=AF][=E6=B7=BB=E5=8A=A0]:c?= =?UTF-8?q?=E7=AB=AF=E6=B7=BB=E5=8A=A0=E5=88=B8=E5=8C=85=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCouponOrderController.java | 9 +- .../simple/domain/vo/WxCouponOrderBVo.java | 2 +- .../simple/domain/vo/WxCouponOrderCVo.java | 309 ++++++++++++++++++ .../simple/mapper/WxCouponOrderMapper.java | 3 + .../simple/service/WxCouponOrderService.java | 9 +- .../impl/WxCouponOrderServiceImpl.java | 29 +- .../resources/mapper/WxCouponOrderMapper.xml | 46 +++ 7 files changed, 391 insertions(+), 16 deletions(-) create mode 100644 mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderCVo.java diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCouponOrderController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCouponOrderController.java index 1d563b2cd..f2a3e4e0a 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxCouponOrderController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCouponOrderController.java @@ -6,6 +6,7 @@ import com.simple.common.Result; import com.simple.common.ResultData; import com.simple.domain.po.WxCUser; import com.simple.domain.po.WxCouponOrder; +import com.simple.domain.vo.WxCouponOrderCVo; import com.simple.exception.MallinkException; import com.simple.service.WxCouponOrderService; import io.swagger.annotations.Api; @@ -56,7 +57,6 @@ public class WxCouponOrderController extends BaseController { } } - @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @@ -65,12 +65,7 @@ public class WxCouponOrderController extends BaseController { @ApiImplicitParam(name = "couponOrderStatus", value="券状态状态:0,待使用 1,已核销 2,已过期 3,已作废", dataType="int", paramType = "query",required=false) }) public ResultData list(Integer couponOrderStatus, Integer pageNum, Integer pageSize) { - WxCUser user = getUser(); - WxCouponOrder wxCouponOrder = new WxCouponOrder(); - wxCouponOrder.setTenantId(user.getTenantId()); - wxCouponOrder.setCouponOrderStatus(couponOrderStatus); - final PageInfo page = wxCouponOrderService.listAsPage(wxCouponOrder, pageNum, pageSize); - return new ResultData(page); + return wxCouponOrderService.listCUserVoAsPage(getUser().getId(), couponOrderStatus, pageNum, pageSize); } @ApiOperation(value = "根据id查询接口", notes = "{\"couponOrderId\":\"string\"}") diff --git a/mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderBVo.java b/mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderBVo.java index 5e55cced1..4e8d38b7d 100644 --- a/mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderBVo.java +++ b/mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderBVo.java @@ -2,7 +2,7 @@ package com.simple.domain.vo; import com.simple.domain.po.WxCouponOrder; -public class WxCouponOrderCVo extends WxCouponOrder{ +public class WxCouponOrderBVo extends WxCouponOrder{ /** * diff --git a/mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderCVo.java b/mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderCVo.java new file mode 100644 index 000000000..4aef73e2c --- /dev/null +++ b/mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderCVo.java @@ -0,0 +1,309 @@ +package com.simple.domain.vo; + +import com.simple.domain.po.WxCouponOrder; + +import javax.persistence.Id; +import javax.persistence.Transient; +import java.util.Date; +import java.util.List; + +public class WxCouponOrderCVo 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 = "tenantId") + private String tenantId; + /*单张券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; + /*用户订单ID**/ + @io.swagger.annotations.ApiModelProperty(value = "用户订单ID", name = "orderId") + private Long orderId; + /*该订单对应券的实际过期时间**/ + @io.swagger.annotations.ApiModelProperty(value = "该订单对应券的实际过期时间 ", name = "expiredTime") + private Date expiredTime; + /*状态:0,待使用 1,已核销 2,已过期 3,已作废 **/ + @io.swagger.annotations.ApiModelProperty(value = "状态:0,待使用 1,已核销 2,已过期 3,已作废 ", name = "couponOrderStatus") + private Integer couponOrderStatus; + /***/ + @io.swagger.annotations.ApiModelProperty(value = "", name = "createDate") + private Date createDate; + /***/ + @io.swagger.annotations.ApiModelProperty(value = "", name = "updateDate") + private Date updateDate; + /*单券实际购买价格**/ + @io.swagger.annotations.ApiModelProperty(value = "单券实际购买价格", name = "couponPrice") + private Integer couponPrice; + + /* 券类型信息 */ + /*商户id**/ + @io.swagger.annotations.ApiModelProperty(value="商户id",name="merchantId") + private Long merchantId; + /*券类型(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; + + public String getTenantId() { + return tenantId; + } + public void setTenantId(String _tenantId) { + tenantId = _tenantId; + } + public Long getCouponId() { + return couponId; + } + public void setCouponId(Long _couponId) { + couponId = _couponId; + } + public Long getCUserId() { + return cUserId; + } + public void setCUserId(Long _cUserId) { + cUserId = _cUserId; + } + public Long getBUserId() { + return bUserId; + } + public void setBUserId(Long _bUserId) { + bUserId = _bUserId; + } + public Long getOrderId() { + return orderId; + } + public void setOrderId(Long _orderId) { + orderId = _orderId; + } + public Date getExpiredTime() { + return expiredTime; + } + public void setExpiredTime(Date _expiredTime) { + expiredTime = _expiredTime; + } + public Integer getCouponOrderStatus() { + return couponOrderStatus; + } + public void setCouponOrderStatus(Integer _couponOrderStatus) { + couponOrderStatus = _couponOrderStatus; + } + 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 getCouponPrice() { + return couponPrice; + } + public void setCouponPrice(Integer _couponPrice) { + couponPrice = _couponPrice; + } + + + public Long getMerchantId() { + return merchantId; + } + public void setMerchantId(Long _merchantId) { + merchantId = _merchantId; + } + 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 static enum Field { + Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), + TenantId_ASC("`tenantId` ASC"), + TenantId_DESC("`tenantId` DESC"), + CouponId_ASC("`couponId` ASC"), + CouponId_DESC("`couponId` DESC"), + CUserId_ASC("`cUserId` ASC"), + CUserId_DESC("`cUserId` DESC"), + BUserId_ASC("`bUserId` ASC"), + BUserId_DESC("`bUserId` DESC"), + OrderId_ASC("`orderId` ASC"), + OrderId_DESC("`orderId` DESC"), + ExpiredTime_ASC("`expiredTime` ASC"), + ExpiredTime_DESC("`expiredTime` DESC"), + CouponOrderStatus_ASC("`couponOrderStatus` ASC"), + CouponOrderStatus_DESC("`couponOrderStatus` DESC"), + CreateDate_ASC("`createDate` ASC"), + CreateDate_DESC("`createDate` DESC"), + UpdateDate_ASC("`updateDate` ASC"), + UpdateDate_DESC("`updateDate` DESC"), + CouponPrice_ASC("`couponPrice` ASC"), + CouponPrice_DESC("`couponPrice` 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(WxCouponOrder.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(WxCouponOrder.Field.valueOf(cols[k])); + } + this.setSortColumns(fList.toArray(new WxCouponOrder.Field[fList.size()])); + } else { + this.setSortColumns(WxCouponOrder.Field.valueOf(sortColumns)); + } + } + +} diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java index 27ca8c17a..5b17fdda7 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java @@ -2,6 +2,7 @@ package com.simple.mapper; import java.util.*; import com.simple.common.CommonMapper; +import com.simple.domain.vo.WxCouponOrderCVo; import org.apache.ibatis.annotations.Param; import com.simple.domain.po.WxCouponOrder; @@ -12,4 +13,6 @@ public interface WxCouponOrderMapper extends CommonMapper { List findListOfUnverifiedByDate(Map dateMap); List findListOfVerifiedByDate(Map dateMap); + List findListOfCUser(Map paramMap); + } diff --git a/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java b/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java index a59286186..ca1083a7a 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java @@ -69,11 +69,16 @@ public interface WxCouponOrderService { /** * 根据日期 b用户查券list * - * @param bUserId 退券(款)人(登录用户) + * @param bUserId B端用户) */ ResultData listOnDateAsPage(Long bUserId, String date, Integer pageIndex, Integer pageSize, boolean isVerified); + /** + * 根据日期 b用户查券list + * + * @param bUserId B端用户 + */ - + ResultData listCUserVoAsPage(Long cUserId, Integer pageIndex, Integer pageSize, Integer status); } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java index 910b6a00c..285230b69 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java @@ -7,13 +7,11 @@ import com.simple.common.IdWorker; import com.simple.common.Result; import com.simple.common.ResultData; import com.simple.domain.po.*; +import com.simple.domain.vo.WxCouponOrderCVo; import com.simple.enums.EnumCouponOrderStatus; import com.simple.enums.EnumCouponStatus; import com.simple.exception.MallinkException; -import com.simple.mapper.WxMerchantMapper; -import com.simple.mapper.WxOrderMapper; -import com.simple.mapper.WxCouponOrderMapper; -import com.simple.mapper.WxMerchantBUserMapper; +import com.simple.mapper.*; import com.simple.service.WxCouponOrderService; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -41,6 +39,9 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { @Autowired WxMerchantBUserMapper wxMerchantBUserMapper; + @Autowired + WxCUserMapper wxCUserMapper; + @Override public PageInfo listAsPage(WxCouponOrder record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findList(record)); @@ -77,7 +78,6 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } - @Override public ResultData listOnDateAsPage(Long bUserId, String date, Integer pageIndex, Integer pageSize, boolean isVerified) { @@ -93,7 +93,6 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND); } - SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); String dateString; Date startDate; @@ -150,6 +149,24 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } + @Override + public ResultData listCUserVoAsPage(Long cUserId, Integer status, Integer pageIndex, Integer pageSize) { + + WxCUser wxCuser = wxCUserMapper.selectByPrimaryKey(cUserId); + if(wxCuser == null){ + logger.error("用户不存在:"+ cUserId); + throw new MallinkException(ErrorCode.USER_IS_EMPTY); + } + + Map paramMap = new HashMap(); + paramMap.put("cUserId", cUserId); + paramMap.put("tenantId", wxCuser.getTenantId()); + if (status != null) + paramMap.put("status", status); + + return new ResultData(PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfCUser(paramMap))); + } + @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index d20727c21..b78ef72cd 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -121,4 +121,50 @@ + + + c.id,c.expired_time,c.coupon_order_status,c.create_date,c.update_date,c.coupon_price, + co.cover_img,co.title,co.sub_title,co.sale_price,co.use_price,co.price + + + + c.id,c.tenant_id,c.coupon_id,c.c_user_id,c.b_user_id,c.order_id,c.expired_time,c.coupon_order_status,c.create_date,c.update_date,c.coupon_price + co.merchant_id,co.type,co.cover_img,co.title,co.sub_title,co.sale_price,co.use_price,co.price,co.detail,co.remark + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 781a1707e324f768f27e3714cde54f2ce1e0f9be Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 24 Aug 2018 15:08:05 +0800 Subject: [PATCH 16/58] =?UTF-8?q?[=E6=95=B0=E6=8D=AE=E5=A1=94=E5=8F=B0-?= =?UTF-8?q?=E8=BF=90=E8=90=A5=E6=95=B0=E6=8D=AE][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E6=95=B0=E6=8D=AE=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DataTowerController.java | 77 ++---------- .../mapper/WxDateAmountRecordMapper.java | 11 +- .../com/simple/service/DataTowerService.java | 10 ++ .../service/impl/DataTowerServiceImpl.java | 119 ++++++++++++++++++ .../mapper/WxDateAmountRecordMapper.xml | 17 ++- 5 files changed, 158 insertions(+), 76 deletions(-) create mode 100644 mallinkService/src/main/java/com/simple/service/DataTowerService.java create mode 100644 mallinkService/src/main/java/com/simple/service/impl/DataTowerServiceImpl.java diff --git a/mallinkAdmin/src/main/java/com/simple/controller/DataTowerController.java b/mallinkAdmin/src/main/java/com/simple/controller/DataTowerController.java index 95b6d2847..22ef453ff 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/DataTowerController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/DataTowerController.java @@ -1,15 +1,16 @@ package com.simple.controller; import com.simple.common.ResultData; +import com.simple.service.DataTowerService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.ArrayList; -import java.util.List; +import java.util.Map; @Api(description = "数据塔台") @RestController @@ -19,75 +20,17 @@ public class DataTowerController extends BaseController { private Logger logger = Logger.getLogger(DataTowerController.class); + @Autowired + private DataTowerService dataTowerService; - @ApiOperation("查询客流") - @PostMapping("/queryCustomer") - public ResultData queryCustomer() { - List series = new ArrayList<>(); + @ApiOperation("查询运营") + @PostMapping("/queryRunning") + public ResultData queryRunning() { - List seriesdata = new ArrayList<>(); - seriesdata.add(1); - seriesdata.add(2); - seriesdata.add(3); - seriesdata.add(4); - seriesdata.add(5); - seriesdata.add(6); - seriesdata.add(7); - seriesdata.add(8); - seriesdata.add(9); - seriesdata.add(10); - seriesdata.add(11); - seriesdata.add(12); - seriesdata.add(13); - seriesdata.add(14); - seriesdata.add(15); - seriesdata.add(16); - seriesdata.add(17); - seriesdata.add(18); - series.add(seriesdata); - seriesdata = new ArrayList<>(); - seriesdata.add(10); - seriesdata.add(20); - seriesdata.add(30); - seriesdata.add(40); - seriesdata.add(50); - seriesdata.add(60); - seriesdata.add(70); - seriesdata.add(80); - seriesdata.add(90); - seriesdata.add(100); - seriesdata.add(110); - seriesdata.add(120); - seriesdata.add(130); - seriesdata.add(140); - seriesdata.add(150); - seriesdata.add(160); - seriesdata.add(170); - seriesdata.add(180); - series.add(seriesdata); - seriesdata = new ArrayList<>(); - seriesdata.add(100); - seriesdata.add(200); - seriesdata.add(300); - seriesdata.add(400); - seriesdata.add(500); - seriesdata.add(600); - seriesdata.add(700); - seriesdata.add(800); - seriesdata.add(900); - seriesdata.add(1000); - seriesdata.add(1100); - seriesdata.add(1200); - seriesdata.add(1300); - seriesdata.add(1400); - seriesdata.add(1500); - seriesdata.add(1600); - seriesdata.add(1700); - seriesdata.add(1800); - series.add(seriesdata); + Map data=dataTowerService.queryRunning(getTenantId()); - return new ResultData(series); + return new ResultData(data); } diff --git a/mallinkService/src/main/java/com/simple/mapper/WxDateAmountRecordMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxDateAmountRecordMapper.java index 6b1cb4d4a..9c0bda386 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxDateAmountRecordMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxDateAmountRecordMapper.java @@ -1,17 +1,18 @@ package com.simple.mapper; -import java.util.*; import com.simple.common.CommonMapper; -import org.apache.ibatis.annotations.Param; import com.simple.domain.po.WxDateAmountRecord; +import java.util.List; +import java.util.Map; + public interface WxDateAmountRecordMapper extends CommonMapper { List findList(WxDateAmountRecord wxDateAmountRecord); int updateAmount(WxDateAmountRecord wxDateAmountRecord); - - - + + List> queryprice(String tenantId); + } diff --git a/mallinkService/src/main/java/com/simple/service/DataTowerService.java b/mallinkService/src/main/java/com/simple/service/DataTowerService.java new file mode 100644 index 000000000..e4c992528 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/DataTowerService.java @@ -0,0 +1,10 @@ +package com.simple.service; + + +import java.util.Map; + +public interface DataTowerService { + + Map queryRunning(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 new file mode 100644 index 000000000..1336febf8 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/impl/DataTowerServiceImpl.java @@ -0,0 +1,119 @@ +package com.simple.service.impl; + +import apple.laf.JRSUIUtils; +import com.simple.domain.po.WxDateAmountRecord; +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.service.DataTowerService; +import com.simple.utils.DateUtils; +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.util.*; +import java.util.stream.Collectors; + +@Service +public class DataTowerServiceImpl implements DataTowerService { + + private Logger logger = Logger.getLogger(getClass()); + + @Autowired + WxShopMapper wxShopMapper; + + @Autowired + WxMerchantMapper wxMerchantMapper; + + @Autowired + WxMerchantTradeDailyMapper wxMerchantTradeDailyMapper; + + @Autowired + WxDateAmountRecordMapper wxDateAmountRecordMapper; + + + @Override + public Map queryRunning(String tenantId) { + WxShop wxShop = new WxShop(); + wxShop.setTenantId(tenantId); + wxShop.setStatus(1); + List yczlist = wxShopMapper.findList(wxShop); + wxShop.setStatus(0); + List wczlist = wxShopMapper.findList(wxShop); + + //出租与未出租 + HashMap datamap = new HashMap<>(); + int yczsize = yczlist.size(); + int wczsize = wczlist.size(); + int size = yczsize + wczsize; + if(size==0){ + datamap.put("yczsl",0); + datamap.put("wczsl",0); + datamap.put("yczl",0); + datamap.put("wczl",0); + }else{ + datamap.put("yczsl",yczsize); + datamap.put("wczsl",wczsize); + double yczld=((double)yczsize/size)*100; + double dczl = new BigDecimal(yczld).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + double wczld = ((double) wczsize / size) * 100; + double wczl = new BigDecimal(wczld).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + datamap.put("yczl", dczl+"%"); + datamap.put("wczl", wczl+"%"); + } + + //上报 + WxMerchant wxMerchant = new WxMerchant(); + wxMerchant.setTenantId(tenantId); + wxMerchant.setStatus(1); + List merchants = wxMerchantMapper.findList(wxMerchant); + + WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); + wxMerchantTradeDaily.setTenantId(tenantId); + String reportdate = DateUtils.getTimeBefore(1, new Date()); + wxMerchantTradeDaily.setReportDate(reportdate); + List tradelist = wxMerchantTradeDailyMapper.findList(wxMerchantTradeDaily); + int merchantsize = merchants.size(); + int tradesize = tradelist.size(); + if(merchantsize>0 && tradesize>0){ + double shsbld = ((double)tradesize/merchantsize)*100; + double shsbl = new BigDecimal(shsbld).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + datamap.put("shsbl",shsbl+"%"); + }else{ + datamap.put("shsbl",0); + } + + int shsbjg = tradelist.stream().mapToInt(WxMerchantTradeDaily::getTradeAmt).sum(); + datamap.put("shsbjg",shsbjg); + + List> recordlist=wxDateAmountRecordMapper.queryprice(tenantId); + Map collect = recordlist.stream().collect(Collectors.toMap(m -> { + return m.get("date"); + }, m -> { + return m.get("price"); + })); + + TreeMap recordmap = new TreeMap<>(); + recordmap.putAll(collect); + + /*WxDateAmountRecord wxDateAmountRecord = new WxDateAmountRecord(); + wxDateAmountRecord.setTenantId(tenantId); + wxDateAmountRecord.setType(0); + List records = wxDateAmountRecordMapper.findList(wxDateAmountRecord); + Map recordmap = records.stream(). + collect(Collectors.groupingBy(WxDateAmountRecord::getDate, + TreeMap::new, + Collectors.summingInt(r -> { + return r.getPayPrice().intValue(); + })));*/ + + datamap.put("records",recordmap); + + return datamap; + } +} diff --git a/mallinkService/src/main/resources/mapper/WxDateAmountRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxDateAmountRecordMapper.xml index b7578ed88..f9534165d 100644 --- a/mallinkService/src/main/resources/mapper/WxDateAmountRecordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxDateAmountRecordMapper.xml @@ -96,8 +96,17 @@ and type=#{type} and date = #{date} - - - - + + + + + + + + From 44a91eb58d3bdb81ec3f205450ab3a02d33c9e92 Mon Sep 17 00:00:00 2001 From: hupeng Date: Fri, 24 Aug 2018 15:49:01 +0800 Subject: [PATCH 17/58] =?UTF-8?q?[C=E7=AB=AF][=E6=96=B0=E5=A2=9E]:?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0C=E7=AB=AF=E7=94=A8=E6=88=B7=E5=88=B8?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCouponOrderController.java | 34 ++++++++------- .../java/com/simple/domain/po/WxMerchant.java | 2 +- .../simple/domain/vo/WxCouponOrderCVo.java | 41 +++++++++++++++++++ .../simple/mapper/WxCouponOrderMapper.java | 2 +- .../simple/service/WxCouponOrderService.java | 11 ++++- .../impl/WxCouponOrderServiceImpl.java | 17 +++++++- .../resources/mapper/WxCouponOrderMapper.xml | 29 +++++++++++-- 7 files changed, 109 insertions(+), 27 deletions(-) diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCouponOrderController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCouponOrderController.java index f2a3e4e0a..7ba6678f0 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxCouponOrderController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCouponOrderController.java @@ -57,7 +57,7 @@ public class WxCouponOrderController extends BaseController { } } - @ApiOperation("分页列表接口") + @ApiOperation("券包分页列表接口") @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @@ -65,26 +65,24 @@ public class WxCouponOrderController extends BaseController { @ApiImplicitParam(name = "couponOrderStatus", value="券状态状态:0,待使用 1,已核销 2,已过期 3,已作废", dataType="int", paramType = "query",required=false) }) public ResultData list(Integer couponOrderStatus, Integer pageNum, Integer pageSize) { + + if(pageNum == null || pageSize == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } return wxCouponOrderService.listCUserVoAsPage(getUser().getId(), couponOrderStatus, pageNum, pageSize); } - @ApiOperation(value = "根据id查询接口", notes = "{\"couponOrderId\":\"string\"}") - @PostMapping("/findById") - public ResultData findById(@RequestBody Map paramMap) { - logger.info(paramMap.toString()); - String couponOrderIdStr = paramMap.get("couponOrderId"); - if (StringUtils.isBlank(couponOrderIdStr)) { - logger.error("couponOrderId不能为空: " + paramMap.toString()); - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponOrderId不能为空"); - } - Long couponOrderId = 0L; - try { - couponOrderId = Long.valueOf(couponOrderIdStr); - } catch (NumberFormatException e) { - couponOrderId = 0L; - logger.error("couponOrderId参数不正确: " + paramMap.toString()); - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponOrderId参数不正确"); + @ApiOperation(value = "卡券详情接口") + @GetMapping("detail") + @ApiImplicitParams({ + @ApiImplicitParam(name = "couponOrderId", value = "券ID", dataType = "string", paramType = "query", required = true) + }) + public ResultData detail(String couponOrderId) { + + if(couponOrderId == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } - return new ResultData(Result.SUCCESS, "查询成功", wxCouponOrderService.getById(couponOrderId)); + + return new ResultData(wxCouponOrderService.detailCUserVo(getUser().getId(), couponOrderId)); } } diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java index 02e7bb1c1..a7ea82a0d 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java @@ -82,7 +82,7 @@ public class WxMerchant implements Serializable { /*停车厂商参数**/ @io.swagger.annotations.ApiModelProperty(value="停车厂商参数",name="carParams") private String carParams; - + /*商户状态**/ @io.swagger.annotations.ApiModelProperty(value="状态1可用0停用",name="status") private Integer status; diff --git a/mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderCVo.java b/mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderCVo.java index 4aef73e2c..cd9b375a4 100644 --- a/mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderCVo.java +++ b/mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderCVo.java @@ -108,6 +108,20 @@ public class WxCouponOrderCVo extends WxCouponOrder{ @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; + public String getTenantId() { return tenantId; } @@ -231,6 +245,33 @@ public class WxCouponOrderCVo extends WxCouponOrder{ remark = _remark; } + + 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"), TenantId_ASC("`tenantId` ASC"), diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java index 5b17fdda7..0d6c5b0ea 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java @@ -14,5 +14,5 @@ public interface WxCouponOrderMapper extends CommonMapper { List findListOfVerifiedByDate(Map dateMap); List findListOfCUser(Map paramMap); - + WxCouponOrderCVo selectDetailOfCUser(Map paramMap); } diff --git a/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java b/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java index ca1083a7a..d293d3772 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java @@ -75,10 +75,17 @@ public interface WxCouponOrderService { ResultData listOnDateAsPage(Long bUserId, String date, Integer pageIndex, Integer pageSize, boolean isVerified); /** - * 根据日期 b用户查券list + * C用户查券list * - * @param bUserId B端用户 + * @param bUserId C端用户 */ ResultData listCUserVoAsPage(Long cUserId, Integer pageIndex, Integer pageSize, Integer status); + + /** + * C用户查券详情 + * + * @param bUserId C端用户 + */ + ResultData detailCUserVo(Long cUserId, String couponOrderId); } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java index 285230b69..a8561aba9 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java @@ -148,7 +148,6 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { return new ResultData(resultMap); } - @Override public ResultData listCUserVoAsPage(Long cUserId, Integer status, Integer pageIndex, Integer pageSize) { @@ -167,6 +166,22 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { return new ResultData(PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfCUser(paramMap))); } + @Override + public ResultData detailCUserVo(Long cUserId, String couponOrderId) { + WxCUser wxCuser = wxCUserMapper.selectByPrimaryKey(cUserId); + if(wxCuser == null){ + logger.error("用户不存在:"+ cUserId); + throw new MallinkException(ErrorCode.USER_IS_EMPTY); + } + + Map paramMap = new HashMap(); + paramMap.put("cUserId", cUserId); + paramMap.put("tenantId", wxCuser.getTenantId()); + paramMap.put("couponOrderId", couponOrderId); + + return new ResultData(wxCouponOrderMapper.selectDetailOfCUser(paramMap)); + } + @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index b78ef72cd..93e6bd866 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -125,11 +125,13 @@ c.id,c.expired_time,c.coupon_order_status,c.create_date,c.update_date,c.coupon_price, co.cover_img,co.title,co.sub_title,co.sale_price,co.use_price,co.price + m.name - c.id,c.tenant_id,c.coupon_id,c.c_user_id,c.b_user_id,c.order_id,c.expired_time,c.coupon_order_status,c.create_date,c.update_date,c.coupon_price - co.merchant_id,co.type,co.cover_img,co.title,co.sub_title,co.sale_price,co.use_price,co.price,co.detail,co.remark + c.id,c.tenant_id,c.coupon_id,c.c_user_id,c.b_user_id,c.order_id,c.expired_time,c.coupon_order_status,c.create_date,c.update_date,c.coupon_price, + co.merchant_id,co.type,co.cover_img,co.title,co.sub_title,co.sale_price,co.use_price,co.price,co.detail, + m.img_url,m.name,m.link_phone,m.status @@ -155,16 +157,35 @@ + + + + + + + + + From e8e57429a248fe3f90d177c81997feded36c45f8 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 24 Aug 2018 15:54:43 +0800 Subject: [PATCH 18/58] =?UTF-8?q?[=E6=95=B0=E6=8D=AE=E5=A1=94=E5=8F=B0-?= =?UTF-8?q?=E8=BF=90=E8=90=A5=E6=95=B0=E6=8D=AE][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B8=8D=E9=9C=80=E8=A6=81=E7=9A=84import?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/simple/service/impl/DataTowerServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 1336febf8..afb7c8b20 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/DataTowerServiceImpl.java @@ -1,7 +1,5 @@ package com.simple.service.impl; -import apple.laf.JRSUIUtils; -import com.simple.domain.po.WxDateAmountRecord; import com.simple.domain.po.WxMerchant; import com.simple.domain.po.WxMerchantTradeDaily; import com.simple.domain.po.WxShop; @@ -19,6 +17,8 @@ import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; +Ø + @Service public class DataTowerServiceImpl implements DataTowerService { From 5b0579d7cb2ba7e0a44170304fecc5eee1527fc2 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 24 Aug 2018 15:55:47 +0800 Subject: [PATCH 19/58] =?UTF-8?q?[=E6=95=B0=E6=8D=AE=E5=A1=94=E5=8F=B0-?= =?UTF-8?q?=E8=BF=90=E8=90=A5=E6=95=B0=E6=8D=AE][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B8=8D=E9=9C=80=E8=A6=81=E7=9A=84=E7=AC=A6?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/simple/service/impl/DataTowerServiceImpl.java | 1 - 1 file changed, 1 deletion(-) 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 afb7c8b20..bc1a00f7a 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/DataTowerServiceImpl.java @@ -17,7 +17,6 @@ import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; -Ø @Service public class DataTowerServiceImpl implements DataTowerService { From d784ac791cf08dfb4eebda462d6b29c51b2af084 Mon Sep 17 00:00:00 2001 From: hupeng Date: Fri, 24 Aug 2018 16:06:41 +0800 Subject: [PATCH 20/58] =?UTF-8?q?[C=E7=AB=AF][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E4=BF=AE=E5=A4=8DC=E7=AB=AF=E5=88=97=E8=A1=A8=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxCouponOrderMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 93e6bd866..a847cfa55 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -124,7 +124,7 @@ c.id,c.expired_time,c.coupon_order_status,c.create_date,c.update_date,c.coupon_price, - co.cover_img,co.title,co.sub_title,co.sale_price,co.use_price,co.price + co.cover_img,co.title,co.sub_title,co.sale_price,co.use_price,co.price, m.name From 8c03b39e34df4fa765f845cfdf57b3c18edc020c Mon Sep 17 00:00:00 2001 From: hupeng Date: Fri, 24 Aug 2018 17:18:02 +0800 Subject: [PATCH 21/58] =?UTF-8?q?[=E6=95=B0=E6=8D=AE=E5=BA=93][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E4=BF=AE=E6=94=B9building=E8=A1=A8name=E4=B8=BAbuil?= =?UTF-8?q?ding=5Fname?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxMallBuildingMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxMallBuildingMapper.xml b/mallinkService/src/main/resources/mapper/WxMallBuildingMapper.xml index 98ae465aa..20d51513f 100644 --- a/mallinkService/src/main/resources/mapper/WxMallBuildingMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMallBuildingMapper.xml @@ -5,7 +5,7 @@ - + @@ -33,7 +33,7 @@ - + and `name` like concat('%', #{name},'%') From a63ae94da6dfbbd9002831124aff63ed368229b3 Mon Sep 17 00:00:00 2001 From: hupeng Date: Fri, 24 Aug 2018 17:35:25 +0800 Subject: [PATCH 22/58] =?UTF-8?q?[=E6=95=B0=E6=8D=AE=E5=BA=93][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E4=BF=AE=E6=94=B9building=E8=A1=A8name=E4=B8=BAbuil?= =?UTF-8?q?ding=5Fname,=E4=BF=AE=E7=90=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxMallBuildingMapper.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxMallBuildingMapper.xml b/mallinkService/src/main/resources/mapper/WxMallBuildingMapper.xml index 20d51513f..9a506e00e 100644 --- a/mallinkService/src/main/resources/mapper/WxMallBuildingMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMallBuildingMapper.xml @@ -12,7 +12,7 @@ - `id`,`tenant_id`,`mall_id`,`name`,`floor_number`,`create_date`,`update_date` + `id`,`tenant_id`,`mall_id`,`building_name`,`floor_number`,`create_date`,`update_date` @@ -33,8 +33,8 @@ - - and `name` like concat('%', #{name},'%') + + and `building_name` like concat('%', #{name},'%') From e5190e906786fb4e04017356e27a6ecba6eb4d23 Mon Sep 17 00:00:00 2001 From: hupeng Date: Fri, 24 Aug 2018 17:40:30 +0800 Subject: [PATCH 23/58] =?UTF-8?q?[=E6=95=B0=E6=8D=AE=E5=BA=93][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E4=BF=AE=E6=94=B9building=E8=A1=A8name=E4=B8=BAbuil?= =?UTF-8?q?ding=5Fname,=E4=BF=AE=E6=94=B9shop=E8=A1=A8=E5=BC=95=E7=94=A8?= 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 d595a8d49..9f2ee3442 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.name buildName,f.floor_name floorName + s.status,b.building_name buildName,f.floor_name floorName 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 4a103de0ebc8365f6547f42fd6e2fdcaf8b0905e Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Fri, 24 Aug 2018 15:55:38 +0800 Subject: [PATCH 24/58] =?UTF-8?q?[=E8=BD=A6=E6=B5=81][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E8=BD=A6=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/controller/WxCarController.java | 13 ++++++---- .../controller/WxUserGrantController.java | 25 ++++++++++++++++++- .../com/simple/service/WxCUserCarService.java | 8 ++++++ .../service/impl/WxCUserCarServiceImpl.java | 5 ++++ 4 files changed, 45 insertions(+), 6 deletions(-) diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java index 1c0882d91..39fe96dec 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java @@ -98,19 +98,22 @@ public class WxCarController extends BaseController if (retObj.getIntValue("code") == EnumETCPCode.SUCCESS.getCode()) { // 获取绑定的车牌 JSONObject dataObj = retObj.getJSONObject("data"); + dataObj.put("vendor", EnumCarVendor.CAR_ETCP.getCode()); String etcpToken = dataObj.getString("token"); - JSONObject dataObj1 = syncCarNumbers(user.getId(), user.getTenantId(), park.getVendorType(), - url, merchantNo, merchantKey, version, - etcpToken); + //JSONObject dataObj1 = syncCarNumbers(user.getId(), user.getTenantId(), park.getVendorType(), + // url, merchantNo, merchantKey, version, + // etcpToken); // c端必须保存此token - return new ResultData(dataObj1); + return new ResultData(dataObj); } else { logger.error("共同登录失败: "+phone); return new ResultData(ErrorCode.ETCP_LOGIN_FAIL.getCode(), "共同登录失败"); } } else if (park.getVendorType() == EnumCarVendor.CAR_TJD.getCode()){ // TJD不需要共同登录 - return new ResultData(); + Map resultMap = new HashMap(); + resultMap.put("vendor", EnumCarVendor.CAR_TJD.getCode()); + return new ResultData(resultMap); } return new ResultData(ErrorCode.CAR_VENDOR_NOT_SUPPORT.getCode(), "登录失败"); diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/simple/controller/WxUserGrantController.java index d4104f7c7..88e22ca76 100755 --- a/mallinkCApi/src/main/java/com/simple/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxUserGrantController.java @@ -282,8 +282,31 @@ public class WxUserGrantController extends BaseController { return new ResultData(Result.SUCCESS,"查询成功",user); } + @ApiOperation("当前用户名下是否有车") + @GetMapping("/carCount") + public ResultData carCount() { + WxCUser user = getUser(); + WxCUserCar userCar = new WxCUserCar(); + userCar.setTenantId(user.getTenantId()); + userCar.setCUserId(user.getId()); + Integer count = wxCUserCarService.countUserCar(userCar); + if (count > 0) { + Map returnMap = new HashMap(); + String phone = user.getPhone(); + if (phone.contains("*")) + phone = user.getVerifyCodePhone(); + returnMap.put("phone", phone); + returnMap.put("count", count); + return new ResultData(Result.SUCCESS,"count获取成功", returnMap); + } else { + Map returnMap = new HashMap(); + returnMap.put("count", count); + return new ResultData(Result.SUCCESS,"count获取成功", returnMap); + } + } + @ApiOperation("获取当前用户车牌列表") - @GetMapping("/carlist") + @GetMapping("/carList") public ResultData getCarList() { WxCUser user = getUser(); WxCUserCar userCar = new WxCUserCar(); diff --git a/mallinkService/src/main/java/com/simple/service/WxCUserCarService.java b/mallinkService/src/main/java/com/simple/service/WxCUserCarService.java index f5fa6c2ae..604f7302c 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCUserCarService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCUserCarService.java @@ -25,6 +25,14 @@ public interface WxCUserCarService { */ List getList(WxCUserCar record); + /** + * 根据实体查询count + * + * @param record + * @return + */ + Integer countUserCar(WxCUserCar record); + /** * 根据实体查询 * diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCUserCarServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCUserCarServiceImpl.java index 2cbd529f2..b38485901 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCUserCarServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCUserCarServiceImpl.java @@ -27,6 +27,11 @@ public class WxCUserCarServiceImpl implements WxCUserCarService { return wxCUserCarMapper.findList(record); } + @Override + public Integer countUserCar(WxCUserCar record) { + return wxCUserCarMapper.selectCount(record); + } + @Override public WxCUserCar getOne(WxCUserCar record) { List userCarList = wxCUserCarMapper.findList(record); From c1cc9a3e3e562af0ec180f96df0abda984830227 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Fri, 24 Aug 2018 17:34:27 +0800 Subject: [PATCH 25/58] =?UTF-8?q?[=E8=BD=A6=E6=B5=81][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E7=BB=91=E8=BD=A6=E7=89=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/controller/WxCarController.java | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java index 39fe96dec..af4ad3ad0 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java @@ -81,9 +81,14 @@ public class WxCarController extends BaseController // 2. get vendor params if (park.getVendorType() == EnumCarVendor.CAR_ETCP.getCode()) { String phone = paramMap.get("phone"); - if (StringUtils.isBlank(phone)) { - logger.error("手机号为空"); - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "phone为空"); + if (StringUtils.isBlank(phone) && StringUtils.isBlank(user.getPhone()) && StringUtils.isBlank(user.getVerifyCodePhone())) { + logger.error("手机号为空,请授权手机号"); + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号为空,请授权手机号"); + } + if (!StringUtils.isBlank(user.getPhone()) && !user.getPhone().contains("*")) { + phone = user.getPhone(); + } else { + phone = user.getVerifyCodePhone(); } String params = park.getVendorParams(); JSONObject objParams = JSON.parseObject(params); @@ -100,9 +105,9 @@ public class WxCarController extends BaseController JSONObject dataObj = retObj.getJSONObject("data"); dataObj.put("vendor", EnumCarVendor.CAR_ETCP.getCode()); String etcpToken = dataObj.getString("token"); - //JSONObject dataObj1 = syncCarNumbers(user.getId(), user.getTenantId(), park.getVendorType(), - // url, merchantNo, merchantKey, version, - // etcpToken); + JSONObject dataObj1 = syncCarNumbers(user.getId(), user.getTenantId(), park.getVendorType(), + url, merchantNo, merchantKey, version, + etcpToken); // c端必须保存此token return new ResultData(dataObj); } else { @@ -213,7 +218,7 @@ public class WxCarController extends BaseController " \"carId\": \"5836b8b52ada463ebc6199579f029561\"\n" + "}\n") @PostMapping("/bindCar") - public ResultData bindCar(Map paramMap) { + public ResultData bindCar(@RequestBody Map paramMap) { WxCUser user = getUser(); // 1, get mall's park WxPark park = getCurrentPark(user); @@ -253,8 +258,9 @@ public class WxCarController extends BaseController dataObj.put("vendor", park.getVendorType()); return new ResultData(dataObj); } else { + String message = retObj.getString("message"); logger.error("绑车牌失败: " + carNumber); - return new ResultData(ErrorCode.ETCP_BIND_FAIL.getCode(), "绑车牌失败"); + return new ResultData(ErrorCode.ETCP_BIND_FAIL.getCode(), message, retObj); } } else if (park.getVendorType() == EnumCarVendor.CAR_TJD.getCode()) { From fadd9ce692bc5bcdc0cc8087a7f25133b18c03a1 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Fri, 24 Aug 2018 18:21:32 +0800 Subject: [PATCH 26/58] =?UTF-8?q?[=E8=BD=A6=E6=B5=81][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=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/WxCarController.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java index af4ad3ad0..147277958 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java @@ -74,7 +74,7 @@ public class WxCarController extends BaseController */ @ApiOperation(value = "初始化/etcp共同登录",notes="{\"phone\":\"string\"}") @PostMapping("/init") - public ResultData init(Map paramMap) { + public ResultData init(@RequestBody Map paramMap) { WxCUser user = getUser(); // 1, get mall's park WxPark park = getCurrentPark(user); @@ -255,7 +255,6 @@ public class WxCarController extends BaseController userCar.setUpdateDate(curr); wxCUserCarService.saveOrUpdate(userCar); JSONObject dataObj = retObj.getJSONObject("data"); - dataObj.put("vendor", park.getVendorType()); return new ResultData(dataObj); } else { String message = retObj.getString("message"); @@ -339,7 +338,7 @@ public class WxCarController extends BaseController " \"isSuccess\": \"0\",\n" + "}\n") @PostMapping("/unbindCar") - public ResultData unbindCar(Map paramMap) { + public ResultData unbindCar(@RequestBody Map paramMap) { WxCUser user = getUser(); // 1, get mall's park WxPark park = getCurrentPark(user); @@ -462,7 +461,7 @@ public class WxCarController extends BaseController " \"pmParkId\": \"d49aeaedcf144f1faf569846d6b16670\"\n" + " }") @PostMapping("/getCarStopFee") - public ResultData getCarStopFee(Map paramMap) { + public ResultData getCarStopFee(@RequestBody Map paramMap) { WxCUser user = getUser(); // 1, get mall's park WxPark park = getCurrentPark(user); @@ -528,7 +527,7 @@ public class WxCarController extends BaseController " \"carId\": \"5836b8b52ada463ebc6199579f029561\"\n" + " }") @PostMapping("/deductionFee") - public ResultData deductionFee(Map paramMap) { + public ResultData deductionFee(@RequestBody Map paramMap) { WxCUser user = getUser(); /// 1, get mall's park WxPark park = getCurrentPark(user); @@ -587,7 +586,7 @@ public class WxCarController extends BaseController */ @ApiOperation(value = "优免券领取", notes="ETCP:={\"etcpToken\":\"string\",\"carNumber\":\"string\",\"couponFreeId\":\"string\"},输出\n{}") @PostMapping("/getCoupon") - public ResultData getCoupon(Map paramMap) { + public ResultData getCoupon(@RequestBody Map paramMap) { WxCUser user = getUser(); /// 1, get mall's park WxPark park = getCurrentPark(user); From 24d55361ffab64e6cca76ed16cb0fe0ef7d03ce3 Mon Sep 17 00:00:00 2001 From: hupeng Date: Fri, 24 Aug 2018 18:40:32 +0800 Subject: [PATCH 27/58] =?UTF-8?q?[C=E7=AB=AF][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=88=B8=E8=AF=A6=E6=83=85=E5=A2=9E=E5=8A=A0=E6=A5=BC=E5=B1=82?= =?UTF-8?q?=E6=A5=BC=E5=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/domain/vo/WxCouponOrderBVo.java | 254 +++++++++++++++++- .../simple/domain/vo/WxCouponOrderCVo.java | 47 ++++ .../resources/mapper/WxCouponOrderMapper.xml | 32 ++- 3 files changed, 327 insertions(+), 6 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderBVo.java b/mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderBVo.java index 4e8d38b7d..ec3f0f626 100644 --- a/mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderBVo.java +++ b/mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderBVo.java @@ -2,13 +2,263 @@ package com.simple.domain.vo; import com.simple.domain.po.WxCouponOrder; +import javax.persistence.Id; +import javax.persistence.Transient; +import java.util.Date; +import java.util.List; + public class WxCouponOrderBVo 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 = "tenantId") + private String tenantId; + /*单张券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; + /*用户订单ID**/ + @io.swagger.annotations.ApiModelProperty(value = "用户订单ID", name = "orderId") + private Long orderId; + /*该订单对应券的实际过期时间**/ + @io.swagger.annotations.ApiModelProperty(value = "该订单对应券的实际过期时间 ", name = "expiredTime") + private Date expiredTime; + /*状态:0,待使用 1,已核销 2,已过期 3,已作废 **/ + @io.swagger.annotations.ApiModelProperty(value = "状态:0,待使用 1,已核销 2,已过期 3,已作废 ", name = "couponOrderStatus") + private Integer couponOrderStatus; + /***/ + @io.swagger.annotations.ApiModelProperty(value = "", name = "createDate") + private Date createDate; + /***/ + @io.swagger.annotations.ApiModelProperty(value = "", name = "updateDate") + private Date updateDate; + /*单券实际购买价格**/ + @io.swagger.annotations.ApiModelProperty(value = "单券实际购买价格", name = "couponPrice") + private Integer couponPrice; + + + /*券类型(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="title") + private String title; + /*售价(适用于类型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; + + + public String getTenantId() { + return tenantId; + } + public void setTenantId(String _tenantId) { + tenantId = _tenantId; + } + public Long getCouponId() { + return couponId; + } + public void setCouponId(Long _couponId) { + couponId = _couponId; + } + public Long getCUserId() { + return cUserId; + } + public void setCUserId(Long _cUserId) { + cUserId = _cUserId; + } + public Long getBUserId() { + return bUserId; + } + public void setBUserId(Long _bUserId) { + bUserId = _bUserId; + } + public Long getOrderId() { + return orderId; + } + public void setOrderId(Long _orderId) { + orderId = _orderId; + } + public Date getExpiredTime() { + return expiredTime; + } + public void setExpiredTime(Date _expiredTime) { + expiredTime = _expiredTime; + } + public Integer getCouponOrderStatus() { + return couponOrderStatus; + } + public void setCouponOrderStatus(Integer _couponOrderStatus) { + couponOrderStatus = _couponOrderStatus; + } + 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 getCouponPrice() { + return couponPrice; + } + public void setCouponPrice(Integer _couponPrice) { + couponPrice = _couponPrice; + } + + + public Integer getType() { + return type; + } + public void setType(Integer _type) { + type = _type; + } + public String getTitle() { + return title; + } + public void setTitle(String _title) { + title = _title; + } + 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 Integer getPrice() { + return price; + } + public void setPrice(Integer _price) { + price = _price; + } + + + + public static enum Field { + Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), + TenantId_ASC("`tenantId` ASC"), + TenantId_DESC("`tenantId` DESC"), + CouponId_ASC("`couponId` ASC"), + CouponId_DESC("`couponId` DESC"), + CUserId_ASC("`cUserId` ASC"), + CUserId_DESC("`cUserId` DESC"), + BUserId_ASC("`bUserId` ASC"), + BUserId_DESC("`bUserId` DESC"), + OrderId_ASC("`orderId` ASC"), + OrderId_DESC("`orderId` DESC"), + ExpiredTime_ASC("`expiredTime` ASC"), + ExpiredTime_DESC("`expiredTime` DESC"), + CouponOrderStatus_ASC("`couponOrderStatus` ASC"), + CouponOrderStatus_DESC("`couponOrderStatus` DESC"), + CreateDate_ASC("`createDate` ASC"), + CreateDate_DESC("`createDate` DESC"), + UpdateDate_ASC("`updateDate` ASC"), + UpdateDate_DESC("`updateDate` DESC"), + CouponPrice_ASC("`couponPrice` ASC"), + CouponPrice_DESC("`couponPrice` 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(WxCouponOrder.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(WxCouponOrder.Field.valueOf(cols[k])); + } + this.setSortColumns(fList.toArray(new WxCouponOrder.Field[fList.size()])); + } else { + this.setSortColumns(WxCouponOrder.Field.valueOf(sortColumns)); + } + } } diff --git a/mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderCVo.java b/mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderCVo.java index cd9b375a4..28c7e2a19 100644 --- a/mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderCVo.java +++ b/mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderCVo.java @@ -122,6 +122,24 @@ public class WxCouponOrderCVo extends WxCouponOrder{ @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 String getTenantId() { return tenantId; } @@ -245,6 +263,35 @@ public class WxCouponOrderCVo extends WxCouponOrder{ 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; diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index a847cfa55..8d1678ccd 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -91,6 +91,9 @@ + + + c.id,c.tenant_id,c.coupon_id,c.c_user_id,c.b_user_id,c.order_id,c.expired_time,c.coupon_order_status,c.create_date,c.update_date,c.coupon_price @@ -130,11 +133,14 @@ c.id,c.tenant_id,c.coupon_id,c.c_user_id,c.b_user_id,c.order_id,c.expired_time,c.coupon_order_status,c.create_date,c.update_date,c.coupon_price, - co.merchant_id,co.type,co.cover_img,co.title,co.sub_title,co.sale_price,co.use_price,co.price,co.detail, - m.img_url,m.name,m.link_phone,m.status + co.merchant_id,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 + @@ -147,6 +153,7 @@ + @@ -158,15 +165,24 @@ + + + + + + + + From dc706196ae075034e1435cf17e5997a22630af7f Mon Sep 17 00:00:00 2001 From: "jinguo24@163.com" Date: Fri, 24 Aug 2018 20:27:10 +0800 Subject: [PATCH 28/58] =?UTF-8?q?[=E4=BC=9A=E5=91=98=E7=AD=89=E7=BA=A7?= =?UTF-8?q?=E6=9D=83=E7=9B=8A][=E4=BF=AE=E6=94=B9]=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxLevelConfigController.java | 31 +++++++++---- .../simple/domain/dto/WxLevelConfigDto.java | 45 +++++++++++++++++++ .../com/simple/domain/po/WxScoreRules.java | 32 ++++++------- .../simple/mapper/WxLevelConfigMapper.java | 2 +- .../simple/service/WxLevelConfigService.java | 3 +- .../impl/WxLevelConfigServiceImpl.java | 6 +++ .../resources/mapper/WxLevelConfigMapper.xml | 5 ++- .../resources/mapper/WxScoreRulesMapper.xml | 14 +++--- 8 files changed, 101 insertions(+), 37 deletions(-) create mode 100644 mallinkService/src/main/java/com/simple/domain/dto/WxLevelConfigDto.java diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxLevelConfigController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxLevelConfigController.java index c13f11c56..13ec0b946 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxLevelConfigController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxLevelConfigController.java @@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RestController; import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; +import com.simple.domain.dto.WxLevelConfigDto; import com.simple.domain.po.WxLevelConfig; import com.simple.service.WxLevelConfigService; @@ -43,20 +44,32 @@ public class WxLevelConfigController extends BaseController @ApiOperation("新增接口") @PostMapping("add") - public ResultData add(@RequestBody WxLevelConfig wxLevelConfig) { + public ResultData add(@RequestBody WxLevelConfigDto dto) { //Assert.notNull(wxLevelConfig.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxLevelConfig.setTenantId(getTenantId()); - wxLevelConfigService.saveOrUpdate(wxLevelConfig); + String[] points = dto.getPoints().split("|"); + String[] level = dto.getLevel().split("|"); + String[] descs =dto.getDescription().split("|"); + String tenantId = getTenantId(); + wxLevelConfigService.deleteAll(); + for(int i=0;i { List findList(WxLevelConfig wxLevelConfig); - + void deleteAll(); diff --git a/mallinkService/src/main/java/com/simple/service/WxLevelConfigService.java b/mallinkService/src/main/java/com/simple/service/WxLevelConfigService.java index dc3771151..0bf3b162e 100644 --- a/mallinkService/src/main/java/com/simple/service/WxLevelConfigService.java +++ b/mallinkService/src/main/java/com/simple/service/WxLevelConfigService.java @@ -1,6 +1,5 @@ package com.simple.service; -import java.util.*; import com.github.pagehelper.PageInfo; import com.simple.domain.po.WxLevelConfig; @@ -39,7 +38,7 @@ public interface WxLevelConfigService { void deleteById(Long id); - + void deleteAll(); diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxLevelConfigServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxLevelConfigServiceImpl.java index 87f991409..eadcc89e5 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxLevelConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxLevelConfigServiceImpl.java @@ -43,6 +43,12 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { public void deleteById(Long id) { wxLevelConfigMapper.deleteByPrimaryKey(id); } + + @Override + public void deleteAll() { + wxLevelConfigMapper.deleteAll(); + + } diff --git a/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml index 8daad3625..e7fdb3570 100644 --- a/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml @@ -60,8 +60,9 @@ - - + + delete from wx_level_config; + diff --git a/mallinkService/src/main/resources/mapper/WxScoreRulesMapper.xml b/mallinkService/src/main/resources/mapper/WxScoreRulesMapper.xml index 9056f9221..b61e4d16a 100644 --- a/mallinkService/src/main/resources/mapper/WxScoreRulesMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxScoreRulesMapper.xml @@ -5,15 +5,15 @@ - + - + - `id`,`tenant_id`,`consumption_amount`,`score_number`,`create_date`,`update_date`,`login_count`,`type` + `id`,`tenant_id`,`consumption_amount`,`login_score_number`,`create_date`,`update_date`,`login_count`,`consumption_score_number` @@ -34,8 +34,8 @@ - - and `score_number` = #{scoreNumber} + + and `login_score_number` = #{loginScoreNumber} @@ -54,8 +54,8 @@ - - and `type` = #{type} + + and `consumption_score_number` = #{consumptionScoreNumber} From f9f90423e4afaeefe6d3bf7f99230b3255a6f1be Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Fri, 24 Aug 2018 22:16:07 +0800 Subject: [PATCH 29/58] =?UTF-8?q?[=E8=BD=A6=E6=B5=81][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?callback=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/simple/controller/WxCarCallBackController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCarCallBackController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCarCallBackController.java index 9aeab622f..9bea75e44 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCarCallBackController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCarCallBackController.java @@ -61,7 +61,7 @@ public class WxCarCallBackController extends BaseController * "remainingDays": "11" * } */ - @RequestMapping(value = "/etcpParkInCallback") + @PostMapping(value = "/etcpParkInCallback") public Result etcpParkInCallback(@RequestBody Map paramMap) { logger.info("etcpParkInCallback: " + paramMap.toString()); String etcpParkId = paramMap.get("parkId"); @@ -111,7 +111,7 @@ public class WxCarCallBackController extends BaseController * "remainingDays": "12" * } */ - @RequestMapping(value = "/etcpParkOutCallback") + @PostMapping(value = "/etcpParkOutCallback") public Result etcpParkOutCallback(@RequestParam Map paramMap) { logger.info("etcpParkOutCallback: " + paramMap.toString()); String etcpParkId = paramMap.get("parkId"); @@ -150,7 +150,7 @@ public class WxCarCallBackController extends BaseController * "time": "2017-08-20 11:57:51" * } */ - @RequestMapping(value = "/etcpUnbindCarCallBack") + @PostMapping(value = "/etcpUnbindCarCallBack") public Result etcpUnbindCarCallBack(@RequestParam Map paramMap) { logger.info("etcpUnbindCarCallBack: " + paramMap.toString()); String carNumber = paramMap.get("plateNumber"); @@ -195,7 +195,7 @@ public class WxCarCallBackController extends BaseController * "time": "2017-08-20 11:57:51" * } */ - @RequestMapping(value = "/etcpPaidCallback") + @PostMapping(value = "/etcpPaidCallback") public Result etcpPaidCallback(@RequestParam Map paramMap) { logger.info("etcpPaidCallback: " + paramMap.toString()); String carNumber = paramMap.get("plateNumber"); From 2d5d9f31d09182555cc39fc65fa62fbaa319c456 Mon Sep 17 00:00:00 2001 From: "jinguo24@163.com" Date: Fri, 24 Aug 2018 22:20:22 +0800 Subject: [PATCH 30/58] =?UTF-8?q?[=E8=A7=92=E8=89=B2=E6=9D=83=E9=99=90][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]=E8=A7=92=E8=89=B2=E6=9D=83=E9=99=90?= =?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/HomeController.java | 14 +++--- .../controller/MallPermissionController.java | 8 +++ .../simple/controller/MallRoleController.java | 49 ++++++++++++++++--- .../controller/WxLevelConfigController.java | 6 +-- .../com/simple/domain/po/MallPermission.java | 28 ++++++----- .../java/com/simple/domain/po/MallRole.java | 34 +++++++++---- .../mapper/MallRolePermissionMapper.java | 2 +- .../service/MallRolePermissionService.java | 4 +- .../impl/MallRolePermissionServiceImpl.java | 21 +++++--- .../service/impl/MallRoleServiceImpl.java | 4 +- .../resources/mapper/MallPermissionMapper.xml | 28 ++--------- .../main/resources/mapper/MallRoleMapper.xml | 14 ++---- .../mapper/MallRolePermissionMapper.xml | 5 +- 13 files changed, 130 insertions(+), 87 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java b/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java index 88905c512..d0f406ae5 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java @@ -55,13 +55,13 @@ public class HomeController { Subject subject = SecurityUtils.getSubject(); UsernamePasswordToken token = new UsernamePasswordToken(user.getUsername(), user.getPassword()); subject.login(token); - List roleList = sysRoleService.findRoleByUserId(user.getId()); - if (null != roleList && roleList.size() > 0) { - List permissionList = sysPermissionService - .findPermissionByRoleIds(roleList.stream().map(MallRole::getId).collect(Collectors.toList())); - user.setRole(roleList); - user.setPermission(permissionList); - } +// List roleList = sysRoleService.findRoleByUserId(user.getId()); +// if (null != roleList && roleList.size() > 0) { +// List permissionList = sysPermissionService +// .findPermissionByRoleIds(roleList.stream().map(MallRole::getId).collect(Collectors.toList())); +// user.setRole(roleList); +// user.setPermission(permissionList); +// } MallUserInfo info =(MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); info.setPassword("保密"); System.out.println("id:"+ SecurityUtils.getSubject().getSession().getId()); diff --git a/mallinkAdmin/src/main/java/com/simple/controller/MallPermissionController.java b/mallinkAdmin/src/main/java/com/simple/controller/MallPermissionController.java index 1d7c7c3b5..f0ac7ce96 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/MallPermissionController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/MallPermissionController.java @@ -12,6 +12,7 @@ import com.simple.common.Result; import com.simple.common.ResultData; import com.simple.domain.po.MallPermission; import com.simple.service.MallPermissionService; +import com.simple.service.MallRolePermissionService; /** * @author chenkx @@ -23,6 +24,7 @@ public class MallPermissionController { @Autowired MallPermissionService mallPermissionService; + @GetMapping("alllist") public ResultData alllist(String ava) { @@ -50,6 +52,12 @@ public class MallPermissionController { mallPermissionService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } + + @GetMapping("/findById") + public ResultData findById(Long id) { + mallPermissionService.getById(id); + return new ResultData(Result.SUCCESS, "成功", null); + } } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/MallRoleController.java b/mallinkAdmin/src/main/java/com/simple/controller/MallRoleController.java index b67898602..f11f5468e 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/MallRoleController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/MallRoleController.java @@ -1,32 +1,40 @@ package com.simple.controller; -import com.simple.domain.po.MallRole; -import com.simple.service.MallRoleService; -import com.simple.service.MallRolePermissionService; -import io.swagger.annotations.Api; +import java.util.ArrayList; +import java.util.List; + +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.GetMapping; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; +import com.simple.domain.po.MallRole; +import com.simple.service.MallRolePermissionService; +import com.simple.service.MallRoleService; + +import io.swagger.annotations.Api; @RestController @RequestMapping("role") @Api(description="角色相关接口") -public class MallRoleController { +public class MallRoleController extends BaseController{ @Autowired private MallRoleService sysRoleService; @Autowired - private MallRolePermissionService SysRolePermissionService; + private MallRolePermissionService sysRolePermissionService; + + private Logger logger = Logger.getLogger(MallRoleController.class); @@ -35,6 +43,28 @@ public class MallRoleController { final PageInfo page = sysRoleService.listAsPage(sysRole, pageNum, pageSize); return new ResultData(page); } + + + @PostMapping("saveOrUpdate") + public ResultData saveOrUpdate(@RequestBody MallRole sysRole ) { + String tenantId = getTenantId(); + int count = sysRoleService.countByName(sysRole.getName(), sysRole.getId()); + if(count>0) { + return new ResultData(ResultData.ERROR,"角色名已存在"); + } + sysRole.setTenantId(tenantId); + sysRoleService.saveOrUpdate(sysRole); +// SysRolePermissionService.deleteById(id); + if(StringUtils.isNoneBlank(sysRole.getMenus())) { + List mIds =new ArrayList<>(); + for(String mId:sysRole.getMenus().split(",")) { + mIds.add(Long.valueOf(mId)); + } + sysRolePermissionService.savePermissions(tenantId,sysRole.getId(), mIds.toArray(new Long[] {}));; + } + return new ResultData(); + } + @PostMapping("add") public ResultData add(MallRole sysRole) { @@ -54,10 +84,13 @@ public class MallRoleController { // Assert.notNull(sysRole.getName(), "角色名不能为空"); return new ResultData(); } + + - @GetMapping("/del") - public ResultData delete(Long id) { + @PostMapping("/del") + public ResultData delete(@RequestBody Long id) { sysRoleService.deleteById(id); + sysRolePermissionService.deleteByRoleId(id); return new ResultData(Result.SUCCESS, "删除成功", null); } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxLevelConfigController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxLevelConfigController.java index 13ec0b946..72fc73465 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxLevelConfigController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxLevelConfigController.java @@ -47,9 +47,9 @@ public class WxLevelConfigController extends BaseController public ResultData add(@RequestBody WxLevelConfigDto dto) { //Assert.notNull(wxLevelConfig.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - String[] points = dto.getPoints().split("|"); - String[] level = dto.getLevel().split("|"); - String[] descs =dto.getDescription().split("|"); + String[] points = dto.getPoints().split("&"); + String[] level = dto.getLevel().split("&"); + String[] descs =dto.getDescription().split("&"); String tenantId = getTenantId(); wxLevelConfigService.deleteAll(); for(int i=0;i ids; + protected List ids; @Transient protected String sortColumns; @@ -31,10 +32,11 @@ public class MallPermission implements Serializable { return sortColumns; } - public List getIds() { + public List getIds() { return ids; } - public void setIds(List ids) { + + public void setIds(List ids) { this.ids = ids; } @@ -53,7 +55,7 @@ public class MallPermission implements Serializable { private String available; /*父编号**/ @io.swagger.annotations.ApiModelProperty(value="父编号",name="parentId") - private String parentId; + private Long parentId; /*父编号列表**/ @io.swagger.annotations.ApiModelProperty(value="父编号列表",name="parentIds") private String parentIds; @@ -107,10 +109,10 @@ public class MallPermission implements Serializable { public void setAvailable(String _available) { available = _available; } - public String getParentId() { + public Long getParentId() { return parentId; } - public void setParentId(String _parentId) { + public void setParentId(Long _parentId) { parentId = _parentId; } public String getParentIds() { @@ -232,9 +234,9 @@ public class MallPermission implements Serializable { sb.append(","); sb.append(fields[k].toString()); } - + } - + public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { @@ -242,7 +244,7 @@ public class MallPermission implements Serializable { } if (sortColumns.contains(",")) { String[] cols = sortColumns.split(","); - List fList = new ArrayList(); + java.util.List fList = new java.util.ArrayList(); for (int k = 0; k < cols.length; k++) { fList.add(Field.valueOf(cols[k])); } diff --git a/mallinkService/src/main/java/com/simple/domain/po/MallRole.java b/mallinkService/src/main/java/com/simple/domain/po/MallRole.java index 0b1809620..cca216034 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/MallRole.java +++ b/mallinkService/src/main/java/com/simple/domain/po/MallRole.java @@ -1,11 +1,12 @@ package com.simple.domain.po; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; +import java.util.*; +import java.math.*; import javax.persistence.Transient; -import java.io.Serializable; -import java.util.ArrayList; import java.util.List; +import javax.persistence.Id; +import java.io.Serializable; @Table(name = "mall_role") public class MallRole implements Serializable { @@ -15,7 +16,7 @@ public class MallRole implements Serializable { protected Long id; @Transient - protected List ids; + protected List ids; @Transient protected String sortColumns; @@ -31,10 +32,11 @@ public class MallRole implements Serializable { return sortColumns; } - public List getIds() { + public List getIds() { return ids; } - public void setIds(List ids) { + + public void setIds(List ids) { this.ids = ids; } @@ -52,6 +54,18 @@ public class MallRole implements Serializable { /*角色描述**/ @io.swagger.annotations.ApiModelProperty(value="角色描述",name="description") private String description; + + @Transient + private String menus; + + public String getMenus() { + return menus; + } + + public void setMenus(String menus) { + this.menus = menus; + } + public String getTenantId() { return tenantId; } @@ -118,9 +132,9 @@ public class MallRole implements Serializable { sb.append(","); sb.append(fields[k].toString()); } - + } - + public void setSortColumns(String sortColumns) { if (sortColumns == null || "".equals(sortColumns.trim())) { @@ -128,7 +142,7 @@ public class MallRole implements Serializable { } if (sortColumns.contains(",")) { String[] cols = sortColumns.split(","); - List fList = new ArrayList(); + java.util.List fList = new java.util.ArrayList(); for (int k = 0; k < cols.length; k++) { fList.add(Field.valueOf(cols[k])); } diff --git a/mallinkService/src/main/java/com/simple/mapper/MallRolePermissionMapper.java b/mallinkService/src/main/java/com/simple/mapper/MallRolePermissionMapper.java index d137b0f68..b65310ef0 100644 --- a/mallinkService/src/main/java/com/simple/mapper/MallRolePermissionMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/MallRolePermissionMapper.java @@ -12,7 +12,7 @@ public interface MallRolePermissionMapper extends CommonMapper map); + void deleteByRoleId(Long roleId); diff --git a/mallinkService/src/main/java/com/simple/service/MallRolePermissionService.java b/mallinkService/src/main/java/com/simple/service/MallRolePermissionService.java index 645373c15..9ab45a7de 100644 --- a/mallinkService/src/main/java/com/simple/service/MallRolePermissionService.java +++ b/mallinkService/src/main/java/com/simple/service/MallRolePermissionService.java @@ -44,10 +44,10 @@ public interface MallRolePermissionService { * @param roleId * @param perId */ - void savePermissions(Long roleId, Long[] perId); + void savePermissions(String tenantId,Long roleId, Long[] perId); - + void deleteByRoleId(Long roleId); } diff --git a/mallinkService/src/main/java/com/simple/service/impl/MallRolePermissionServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/MallRolePermissionServiceImpl.java index d28484338..30063765f 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/MallRolePermissionServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/MallRolePermissionServiceImpl.java @@ -17,7 +17,9 @@ public class MallRolePermissionServiceImpl implements MallRolePermissionService @Autowired MallRolePermissionMapper mallUserRolePermissionMapper; - + + + @Override public PageInfo listAsPage(MallRolePermission record, Integer pageIndex, Integer pageSize) { @@ -49,18 +51,25 @@ public class MallRolePermissionServiceImpl implements MallRolePermissionService @Override - public void savePermissions(Long roleId, Long[] perId) { - Map map = new HashMap<>(); - map.put("roleId", roleId); - mallUserRolePermissionMapper.deleteByRoleId(map); + public void savePermissions(String tenantId,Long roleId, Long[] perId) { +// Map map = new HashMap<>(); +// map.put("roleId", roleId); + mallUserRolePermissionMapper.deleteByRoleId(roleId); for(Long pId:perId){ MallRolePermission permission =new MallRolePermission(); - permission.setId(roleId); + final IdWorker idWorker = IdWorker.get(); + permission.setId(idWorker.nextId()); permission.setPermissionId(pId); + permission.setTenantId(tenantId); + permission.setRoleId(roleId); mallUserRolePermissionMapper.insert(permission); } } + + public void deleteByRoleId(Long roleId) { + mallUserRolePermissionMapper.deleteByRoleId(roleId); + } diff --git a/mallinkService/src/main/java/com/simple/service/impl/MallRoleServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/MallRoleServiceImpl.java index 1c2401cb5..a626e6bf6 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/MallRoleServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/MallRoleServiceImpl.java @@ -57,7 +57,9 @@ public class MallRoleServiceImpl implements MallRoleService { public int countByName(String name,Long id) { Map map = new HashMap<>(2); map.put("name", name); - map.put("id", id); + if(id!=null) { + map.put("id", id); + } return mallRoleMapper.countByName(map); } diff --git a/mallinkService/src/main/resources/mapper/MallPermissionMapper.xml b/mallinkService/src/main/resources/mapper/MallPermissionMapper.xml index 4807ea205..f6cdddd38 100644 --- a/mallinkService/src/main/resources/mapper/MallPermissionMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallPermissionMapper.xml @@ -2,12 +2,12 @@ - + - - + + @@ -22,7 +22,7 @@ where 1 = 1 - and `id` like concat('%', #{id},'%') + and `id` = #{id} @@ -43,7 +43,7 @@ - and `parent_id` like concat('%', #{parentId},'%') + and `parent_id` = #{parentId} @@ -97,24 +97,6 @@ - - - diff --git a/mallinkService/src/main/resources/mapper/MallRoleMapper.xml b/mallinkService/src/main/resources/mapper/MallRoleMapper.xml index 6a72d4913..3322fbb9e 100644 --- a/mallinkService/src/main/resources/mapper/MallRoleMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallRoleMapper.xml @@ -2,7 +2,7 @@ - + @@ -17,7 +17,7 @@ where 1 = 1 - and `id` like concat('%', #{id},'%') + and `id` = #{id} @@ -26,7 +26,7 @@ - + and `name` like concat('%', #{name},'%') @@ -54,18 +54,10 @@ - - - diff --git a/mallinkService/src/main/resources/mapper/MallRolePermissionMapper.xml b/mallinkService/src/main/resources/mapper/MallRolePermissionMapper.xml index 0ea875534..e8c80c5b8 100644 --- a/mallinkService/src/main/resources/mapper/MallRolePermissionMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallRolePermissionMapper.xml @@ -49,8 +49,9 @@ - - + + delete from mall_user_role_permission where role_id=#{roleId} + From 6042be70ca2f1a25b11ad7360ecf63f6cfc4e9f9 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Fri, 24 Aug 2018 22:23:07 +0800 Subject: [PATCH 31/58] =?UTF-8?q?[=E8=BD=A6=E6=B5=81][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/simple/controller/WxCarCallBackController.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCarCallBackController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCarCallBackController.java index 9bea75e44..026582dde 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCarCallBackController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCarCallBackController.java @@ -112,7 +112,7 @@ public class WxCarCallBackController extends BaseController * } */ @PostMapping(value = "/etcpParkOutCallback") - public Result etcpParkOutCallback(@RequestParam Map paramMap) { + public Result etcpParkOutCallback(@RequestBody Map paramMap) { logger.info("etcpParkOutCallback: " + paramMap.toString()); String etcpParkId = paramMap.get("parkId"); WxPark parkQ = new WxPark(); @@ -151,7 +151,7 @@ public class WxCarCallBackController extends BaseController * } */ @PostMapping(value = "/etcpUnbindCarCallBack") - public Result etcpUnbindCarCallBack(@RequestParam Map paramMap) { + public Result etcpUnbindCarCallBack(@RequestBody Map paramMap) { logger.info("etcpUnbindCarCallBack: " + paramMap.toString()); String carNumber = paramMap.get("plateNumber"); @@ -196,7 +196,7 @@ public class WxCarCallBackController extends BaseController * } */ @PostMapping(value = "/etcpPaidCallback") - public Result etcpPaidCallback(@RequestParam Map paramMap) { + public Result etcpPaidCallback(@RequestBody Map paramMap) { logger.info("etcpPaidCallback: " + paramMap.toString()); String carNumber = paramMap.get("plateNumber"); @@ -240,7 +240,7 @@ public class WxCarCallBackController extends BaseController * } */ @RequestMapping(value = "/tjdParkInCallback") - public Map tjdParkInCallback(@RequestParam Map paramMap) { + public Map tjdParkInCallback(@RequestBody Map paramMap) { logger.info("tjdParkInCallback: " + paramMap.toString()); Map map = new HashMap(); @@ -293,7 +293,7 @@ public class WxCarCallBackController extends BaseController * } */ @RequestMapping(value = "/tjdParkoutCallback") - public Map tjdParkOutCallback(@RequestParam Map paramMap) { + public Map tjdParkOutCallback(@RequestBody Map paramMap) { logger.info("tjdParkoutCallback: " + paramMap.toString()); Map map = new HashMap(); From 2cc97de03b77121fb8d93e20405c785e3e18e283 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Fri, 24 Aug 2018 22:23:07 +0800 Subject: [PATCH 32/58] =?UTF-8?q?[=E8=A7=92=E8=89=B2][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?mapper=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/MallRolePermissionMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/MallRolePermissionMapper.xml b/mallinkService/src/main/resources/mapper/MallRolePermissionMapper.xml index e8c80c5b8..57dc679eb 100644 --- a/mallinkService/src/main/resources/mapper/MallRolePermissionMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallRolePermissionMapper.xml @@ -44,13 +44,13 @@ - delete from mall_user_role_permission where role_id=#{roleId} + delete from mall_role_permission where role_id=#{roleId} From a3c9adb3d22f8c25bf3583c4a5a5dad69ed2f747 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Fri, 24 Aug 2018 22:23:07 +0800 Subject: [PATCH 33/58] =?UTF-8?q?[=E8=A7=92=E8=89=B2][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=20=E6=9F=A5=E8=AF=A2=E8=BF=94=E5=9B=9E=E5=80=BC=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/controller/MallRoleController.java | 23 ++++++++++++++++--- .../simple/domain/po/MallRolePermission.java | 2 +- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/MallRoleController.java b/mallinkAdmin/src/main/java/com/simple/controller/MallRoleController.java index f11f5468e..e1c2e3016 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/MallRoleController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/MallRoleController.java @@ -17,6 +17,7 @@ import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; import com.simple.domain.po.MallRole; +import com.simple.domain.po.MallRolePermission; import com.simple.service.MallRolePermissionService; import com.simple.service.MallRoleService; @@ -40,7 +41,23 @@ public class MallRoleController extends BaseController{ @GetMapping("list") public ResultData list(MallRole sysRole, Integer pageNum, Integer pageSize) { + String tenantId = getTenantId(); + sysRole.setTenantId(tenantId); final PageInfo page = sysRoleService.listAsPage(sysRole, pageNum, pageSize); + for(MallRole r:page.getList()) { + MallRolePermission p = new MallRolePermission(); + p.setRoleId(r.getId()); + p.setTenantId(tenantId); + PageInfo pers = sysRolePermissionService.listAsPage(p, 1, 1000); + String menus =""; + for(MallRolePermission rp:pers.getList()) { + menus+=rp.getPermissionId()+","; + } + if(menus.length()>1) { + menus=menus.substring(0, menus.length()-1); + } + r.setMenus(menus); + } return new ResultData(page); } @@ -88,9 +105,9 @@ public class MallRoleController extends BaseController{ @PostMapping("/del") - public ResultData delete(@RequestBody Long id) { - sysRoleService.deleteById(id); - sysRolePermissionService.deleteByRoleId(id); + public ResultData delete(@RequestBody MallRole sysRole) { + sysRoleService.deleteById(sysRole.getId()); + sysRolePermissionService.deleteByRoleId(sysRole.getId()); return new ResultData(Result.SUCCESS, "删除成功", null); } diff --git a/mallinkService/src/main/java/com/simple/domain/po/MallRolePermission.java b/mallinkService/src/main/java/com/simple/domain/po/MallRolePermission.java index 3b2baf53f..1a77bd16a 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/MallRolePermission.java +++ b/mallinkService/src/main/java/com/simple/domain/po/MallRolePermission.java @@ -7,7 +7,7 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -@Table(name = "mall_user_role_permission") +@Table(name = "mall_role_permission") public class MallRolePermission implements Serializable { private static final long serialVersionUID = 1L; From ec9de64b68e58fc618f07df142c02a0b3cac0e28 Mon Sep 17 00:00:00 2001 From: "jinguo24@163.com" Date: Fri, 24 Aug 2018 22:23:07 +0800 Subject: [PATCH 34/58] =?UTF-8?q?[=E7=94=A8=E6=88=B7][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=20=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MallUserInfoController.java | 34 ++++++++++++++++--- .../com/simple/domain/po/MallUserInfo.java | 11 ++++++ .../com/simple/mapper/MallUserRoleMapper.java | 2 +- .../simple/service/MallUserRoleService.java | 2 +- .../service/impl/MallUserRoleServiceImpl.java | 6 ++++ .../resources/mapper/MallUserRoleMapper.xml | 5 +-- 6 files changed, 51 insertions(+), 9 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java b/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java index 0b21784fe..fff141b26 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java @@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.Assert; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -44,6 +45,15 @@ public class MallUserInfoController { @GetMapping("lists") public ResultData listAsPage(MallUserInfo userInfo, Integer pageNum, Integer pageSize){ final PageInfo page = userInfoService.listAsPage(userInfo, pageNum, pageSize); + for(MallUserInfo u:page.getList()) { + MallUserRole r =new MallUserRole(); + r.setUid(u.getId()); + PageInfo ur = userRoleService.listAsPage(r, 1, 1); + if(ur.getSize()>0) { + u.setRoleId(ur.getList().get(0).getRoleId()); + } + } + return new ResultData(page); } @@ -56,32 +66,46 @@ public class MallUserInfoController { @ApiOperation(value = "创建用户接口", response = String.class) @PostMapping("add") - public ResultData createUser(MallUserInfo userInfo){ + public ResultData createUser(@RequestBody MallUserInfo userInfo){ Assert.notNull(userInfo.getUsername(), "用户名不能为空"); Assert.isTrue(checkUnique(userInfo.getUsername(), 0), "重复的用户名"); Assert.notNull(userInfo.getPassword(), "密码不能为空"); PasswordHelper passwordHelper = new PasswordHelper(); passwordHelper.encryptPassword(userInfo); userInfoService.saveOrUpdate(userInfo); + if(userInfo.getRoleId()!=null) { + MallUserRole r = new MallUserRole(); + r.setRoleId(userInfo.getRoleId()); + r.setUid(userInfo.getId()); + userRoleService.saveOrUpdate(r); + } return new ResultData(); } @ApiOperation(value = "修改用户接口", response = String.class) @PostMapping("update") - public ResultData updateUser(MallUserInfo userInfo){ + public ResultData updateUser(@RequestBody MallUserInfo userInfo){ Assert.notNull(userInfo.getUsername(), "用户名不能为空"); Assert.isTrue(checkUnique(userInfo.getUsername(), 1), "重复的用户名"); Assert.notNull(userInfo.getPassword(), "密码不能为空"); PasswordHelper passwordHelper = new PasswordHelper(); passwordHelper.encryptPassword(userInfo); userInfoService.saveOrUpdate(userInfo); + if(userInfo.getRoleId()!=null) { + userRoleService.deleteByUserId(userInfo.getId()); + MallUserRole r = new MallUserRole(); + r.setRoleId(userInfo.getRoleId()); + r.setUid(userInfo.getId()); + userRoleService.saveOrUpdate(r); + } return new ResultData(); } @ApiOperation(value = "删除用户接口", response = String.class) - @GetMapping("/del") - public ResultData deleteUser(Long id) { - userInfoService.deleteById(id); + @PostMapping("/del") + public ResultData deleteUser(@RequestBody MallUserInfo userInfo) { + userInfoService.deleteById(userInfo.getId()); + return new ResultData(); } 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 82bfe3647..318ea159c 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/MallUserInfo.java +++ b/mallinkService/src/main/java/com/simple/domain/po/MallUserInfo.java @@ -65,12 +65,23 @@ public class MallUserInfo implements Serializable { /*0 不是超管 1是超管**/ @io.swagger.annotations.ApiModelProperty(value="0 不是超管 1是超管",name="isAdmin") private Integer isAdmin; + @Transient + private Long roleId; //该用户所有的角色 @Transient private List role; //该用户包含的所有权限 @Transient private List permission; + + public Long getRoleId() { + return roleId; + } + + public void setRoleId(Long roleId) { + this.roleId = roleId; + } + public String getTenantId() { return tenantId; } diff --git a/mallinkService/src/main/java/com/simple/mapper/MallUserRoleMapper.java b/mallinkService/src/main/java/com/simple/mapper/MallUserRoleMapper.java index 699612961..a290214a3 100644 --- a/mallinkService/src/main/java/com/simple/mapper/MallUserRoleMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/MallUserRoleMapper.java @@ -10,7 +10,7 @@ public interface MallUserRoleMapper extends CommonMapper { List findList(MallUserRole mallUserRole); - + void deleteByUserId(Long userId); diff --git a/mallinkService/src/main/java/com/simple/service/MallUserRoleService.java b/mallinkService/src/main/java/com/simple/service/MallUserRoleService.java index 2337f9a49..0de8ca1bb 100644 --- a/mallinkService/src/main/java/com/simple/service/MallUserRoleService.java +++ b/mallinkService/src/main/java/com/simple/service/MallUserRoleService.java @@ -47,7 +47,7 @@ public interface MallUserRoleService { - + void deleteByUserId(Long uid); diff --git a/mallinkService/src/main/java/com/simple/service/impl/MallUserRoleServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/MallUserRoleServiceImpl.java index 070a588bf..c1ede6e5c 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/MallUserRoleServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/MallUserRoleServiceImpl.java @@ -52,6 +52,12 @@ public class MallUserRoleServiceImpl implements MallUserRoleService { public void batchInsert(List u2rs) { mallUserRoleMapper.insertList(u2rs); } + + @Override + public void deleteByUserId(Long uid) { + mallUserRoleMapper.deleteByUserId(uid); + + } diff --git a/mallinkService/src/main/resources/mapper/MallUserRoleMapper.xml b/mallinkService/src/main/resources/mapper/MallUserRoleMapper.xml index 8f3335102..4539be43b 100644 --- a/mallinkService/src/main/resources/mapper/MallUserRoleMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallUserRoleMapper.xml @@ -42,8 +42,9 @@ - - + + delete from mall_user_role where uid=#{userId} + From 28872f3d0c31d3899ac82b29a8eb1939e1a843a7 Mon Sep 17 00:00:00 2001 From: "jinguo24@163.com" Date: Fri, 24 Aug 2018 23:41:43 +0800 Subject: [PATCH 35/58] =?UTF-8?q?[=E7=94=A8=E6=88=B7][=E6=9B=B4=E6=96=B0]?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=B5=84=E6=96=99=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/simple/controller/MallUserInfoController.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java b/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java index fff141b26..21df2c38e 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java @@ -87,9 +87,10 @@ public class MallUserInfoController { public ResultData updateUser(@RequestBody MallUserInfo userInfo){ Assert.notNull(userInfo.getUsername(), "用户名不能为空"); Assert.isTrue(checkUnique(userInfo.getUsername(), 1), "重复的用户名"); - Assert.notNull(userInfo.getPassword(), "密码不能为空"); - PasswordHelper passwordHelper = new PasswordHelper(); - passwordHelper.encryptPassword(userInfo); +// Assert.notNull(userInfo.getPassword(), "密码不能为空"); +// PasswordHelper passwordHelper = new PasswordHelper(); +// passwordHelper.encryptPassword(userInfo); + userInfo.setPassword(null); userInfoService.saveOrUpdate(userInfo); if(userInfo.getRoleId()!=null) { userRoleService.deleteByUserId(userInfo.getId()); From 7261323191cf9a28d4a7907b9500b4210e6ef3b0 Mon Sep 17 00:00:00 2001 From: "jinguo24@163.com" Date: Fri, 24 Aug 2018 23:44:22 +0800 Subject: [PATCH 36/58] =?UTF-8?q?[=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/simple/controller/MallUserInfoController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java b/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java index 21df2c38e..21ca8197d 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java @@ -52,6 +52,7 @@ public class MallUserInfoController { if(ur.getSize()>0) { u.setRoleId(ur.getList().get(0).getRoleId()); } + u.setPassword(null);//不返回密码 } return new ResultData(page); From b309855da784af4b41a9c3084c6e4b522b948e9b Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 25 Aug 2018 11:00:48 +0800 Subject: [PATCH 37/58] =?UTF-8?q?[=E8=BD=A6=E6=B5=81][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=81=9C=E8=BD=A6=E8=B4=B9=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/simple/controller/WxCarController.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java index 147277958..638a20581 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java @@ -376,8 +376,9 @@ public class WxCarController extends BaseController return new ResultData(); } else { + String message = retObj.getString("message"); logger.error("解绑车牌失败"); - return new ResultData(ErrorCode.ETCP_UNBIND_FAIL.getCode(), "解绑车牌失败"); + return new ResultData(ErrorCode.ETCP_UNBIND_FAIL.getCode(), message, retObj); } } else if (park.getVendorType() == EnumCarVendor.CAR_TJD.getCode()) { @@ -486,10 +487,10 @@ public class WxCarController extends BaseController JSONObject retObj = JSON.parseObject(ret); if (retObj.getIntValue("code") == 0) { JSONObject feeObj = retObj.getJSONArray("data").getJSONObject(0); - feeObj.put("vendor", park.getVendorType()); return new ResultData(Result.SUCCESS, "停车费获取成功", feeObj); } else { - return new ResultData(ErrorCode.ETCP_STOP_FEE_FAIL.getCode(), "停车费获取失败"); + String message = retObj.getString("message"); + return new ResultData(ErrorCode.ETCP_STOP_FEE_FAIL.getCode(), message, retObj); } } else if (park.getVendorType() == EnumCarVendor.CAR_TJD.getCode()) { From 258f69a3152a408b0d00a43cd8cb7c1249e82d19 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 25 Aug 2018 11:56:07 +0800 Subject: [PATCH 38/58] =?UTF-8?q?[=E8=BD=A6=E6=B5=81][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=BC=98=E5=85=8D=E5=88=B8=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/controller/WxCarController.java | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCarController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCarController.java index a7878665c..fdab4f65b 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCarController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCarController.java @@ -15,6 +15,8 @@ import com.simple.service.WxMerchantService; import com.simple.service.WxParkService; import com.simple.utils.ETCPUtil; import com.simple.utils.TJDCarUtil; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; @@ -107,18 +109,21 @@ public class WxCarController extends BaseController " {...},\n" + " {...}\n" + " ]}}\n") - @PostMapping("/quanTemplate") - public ResultData quanTemplate(Map paramMap) { - logger.info("quanTemplate: " + paramMap.toString()); + @GetMapping("/quanTemplate") + @ApiImplicitParams({ + @ApiImplicitParam(name="merchantId",value="商户ID",dataType="String", paramType = "query",required=true), + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData quanTemplate(String merchantId, Integer pageNum, Integer pageSize) { + logger.info("quanTemplate: " + merchantId.toString()); MallUserInfo user = getUser(); /// 1, get mall's park WxPark park = getCurrentPark(user); if (park.getVendorType() == EnumCarVendor.CAR_ETCP.getCode()) { - String merchantIdStr = paramMap.get("merchantId"); - if (StringUtils.isBlank(merchantIdStr)) { + if (StringUtils.isBlank(merchantId)) { // 优先从从商户表里取 logger.error("quanTemplate failed, merchantId为空"); - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "merchantId为空"); + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "商户为空"); } String params = park.getVendorParams(); JSONObject objParams = JSON.parseObject(params); @@ -130,7 +135,7 @@ public class WxCarController extends BaseController // bussinessId from 参数信息 String businessId = ""; // 优先从从商户表里取 - businessId = getETCPBusinessID(merchantIdStr); + businessId = getETCPBusinessID(merchantId); if (StringUtils.isBlank(businessId)) { // 1期只有一个虚拟商户,可以写在商场配置里 businessId = objParams.getString("businessId"); @@ -141,7 +146,7 @@ public class WxCarController extends BaseController return new ResultData(retObj.getJSONObject("data")); } else { logger.error("quanTemplate failed, 优免券模板未发现"); - return new ResultData(ErrorCode.ETCP_QUAN_TEMP_FAIL.getCode(), "优免券模板未发现"); + return new ResultData(ErrorCode.ETCP_QUAN_TEMP_FAIL.getCode(), "优免券模板未发现", retObj); } } return new ResultData(ErrorCode.CAR_VENDOR_NOT_SUPPORT.getCode(), "优免券模板失败"); From 8e2616fc1a6ae1b891e59cee9739f4d29c5de192 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 25 Aug 2018 12:18:26 +0800 Subject: [PATCH 39/58] =?UTF-8?q?[=E8=BD=A6=E6=B5=81][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=BC=98=E5=85=8D=E5=88=B8=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/simple/controller/WxCarController.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCarController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCarController.java index fdab4f65b..dc320a020 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCarController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCarController.java @@ -115,23 +115,24 @@ public class WxCarController extends BaseController @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) public ResultData quanTemplate(String merchantId, Integer pageNum, Integer pageSize) { - logger.info("quanTemplate: " + merchantId.toString()); + logger.info("quanTemplate: " + merchantId); MallUserInfo user = getUser(); /// 1, get mall's park WxPark park = getCurrentPark(user); + String params = park.getVendorParams(); + JSONObject objParams = JSON.parseObject(params); + String url = objParams.getString("url"); + String merchantNo = objParams.getString("merchantNo"); + String merchantKey = objParams.getString("merchantKey"); + String version = objParams.getString("version"); + String parkId = park.getParkId(); + if (park.getVendorType() == EnumCarVendor.CAR_ETCP.getCode()) { if (StringUtils.isBlank(merchantId)) { // 优先从从商户表里取 logger.error("quanTemplate failed, merchantId为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "商户为空"); } - String params = park.getVendorParams(); - JSONObject objParams = JSON.parseObject(params); - String url = objParams.getString("url"); - String merchantNo = objParams.getString("merchantNo"); - String merchantKey = objParams.getString("merchantKey"); - String version = objParams.getString("version"); - String parkId = park.getParkId(); // bussinessId from 参数信息 String businessId = ""; // 优先从从商户表里取 From c96b2b55023a1457e037cc3e43cb3a71ee53bb99 Mon Sep 17 00:00:00 2001 From: masterspirit Date: Sat, 25 Aug 2018 12:36:11 +0800 Subject: [PATCH 40/58] =?UTF-8?q?[=E4=BC=9A=E5=91=98=E7=A7=AF=E5=88=86][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]=E6=B7=BB=E5=8A=A0=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=88=96=E8=80=85=E6=B6=88=E8=B4=B9=E5=A2=9E=E9=95=BF=E7=A7=AF?= =?UTF-8?q?=E5=88=86=E6=8E=A5=E5=8F=A3=EF=BC=8C=E8=BF=94=E5=9B=9E=E4=BC=9A?= =?UTF-8?q?=E5=91=98=E7=AD=89=E7=BA=A7=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCampaignController.java | 1 + .../simple/mapper/WxCUserBasicInfoMapper.java | 2 + .../simple/mapper/WxLevelConfigMapper.java | 2 + .../service/WxCUserBasicInfoService.java | 10 ++++ .../simple/service/WxLevelConfigService.java | 7 +++ .../simple/service/WxScoreRulesService.java | 9 +++ .../impl/WxCUserBasicInfoServiceImpl.java | 7 ++- .../impl/WxLevelConfigServiceImpl.java | 15 +++-- .../service/impl/WxScoreRulesServiceImpl.java | 55 ++++++++++++++++--- .../mapper/WxCUserBasicInfoMapper.xml | 6 ++ .../resources/mapper/WxLevelConfigMapper.xml | 5 +- 11 files changed, 101 insertions(+), 18 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCampaignController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCampaignController.java index 20352f96b..e3430b4bb 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCampaignController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCampaignController.java @@ -60,6 +60,7 @@ public class WxCampaignController extends BaseController String[] arys = wxCampaign.getCouponIds().split(","); wxCampaign.setCouponIds(JSON.toJSONString(arys)); } + wxCampaign.setStatus(0); wxCampaign.setTenantId(getTenantId()); // wxCampaign.setSortNum(sortNum+1); wxCampaignService.saveOrUpdate(wxCampaign); diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCUserBasicInfoMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCUserBasicInfoMapper.java index 58022d24d..93a40272a 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCUserBasicInfoMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCUserBasicInfoMapper.java @@ -14,6 +14,8 @@ public interface WxCUserBasicInfoMapper extends CommonMapper list(WxCuerBasicInfoDto record); + + void updateScore(WxCUserBasicInfo record); } diff --git a/mallinkService/src/main/java/com/simple/mapper/WxLevelConfigMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxLevelConfigMapper.java index 2d8516cf3..90a6f0acb 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxLevelConfigMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxLevelConfigMapper.java @@ -11,6 +11,8 @@ public interface WxLevelConfigMapper extends CommonMapper { void deleteAll(); + + String getLevel(@Param("tenantId")String tenantId,@Param("poins")Integer poins); diff --git a/mallinkService/src/main/java/com/simple/service/WxCUserBasicInfoService.java b/mallinkService/src/main/java/com/simple/service/WxCUserBasicInfoService.java index 3470f8799..cb46a7144 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCUserBasicInfoService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCUserBasicInfoService.java @@ -41,6 +41,16 @@ public interface WxCUserBasicInfoService { PageInfo list(WxCuerBasicInfoDto record, Integer pageIndex, Integer pageSize); + + /** + * 修改会员积分 + * @param record + */ + void updateScore(WxCUserBasicInfo record); + + + + diff --git a/mallinkService/src/main/java/com/simple/service/WxLevelConfigService.java b/mallinkService/src/main/java/com/simple/service/WxLevelConfigService.java index 0bf3b162e..5cee0ba5c 100644 --- a/mallinkService/src/main/java/com/simple/service/WxLevelConfigService.java +++ b/mallinkService/src/main/java/com/simple/service/WxLevelConfigService.java @@ -39,6 +39,13 @@ public interface WxLevelConfigService { void deleteAll(); + /** + * 根据积分获取会员等级 + * @param tenantId + * @param score + * @return + */ + String getLevel(String tenantId,int score); diff --git a/mallinkService/src/main/java/com/simple/service/WxScoreRulesService.java b/mallinkService/src/main/java/com/simple/service/WxScoreRulesService.java index 38338cb6b..66251b8b2 100644 --- a/mallinkService/src/main/java/com/simple/service/WxScoreRulesService.java +++ b/mallinkService/src/main/java/com/simple/service/WxScoreRulesService.java @@ -37,6 +37,15 @@ public interface WxScoreRulesService { * @param id */ void deleteById(Long id); + /** + * 登录或消费 调用增长积分 + * @param tenantId + * @param type 1:登录 2:消费 + * @param cUserId + * @return 新增的积分值 + */ + int addScoreByType(String tenantId,int type,Long cUserId); + 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 de5fe9a9d..37e221b2c 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCUserBasicInfoServiceImpl.java @@ -30,9 +30,14 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCUserBasicInfoMapper.list(record)); } + @Override + public void updateScore(WxCUserBasicInfo record) { + wxCUserBasicInfoMapper.updateScore(record); + + } - @Override + @Override public WxCUserBasicInfo getById(Long id) { return wxCUserBasicInfoMapper.selectByPrimaryKey(id); } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxLevelConfigServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxLevelConfigServiceImpl.java index eadcc89e5..52524ddbe 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxLevelConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxLevelConfigServiceImpl.java @@ -49,12 +49,11 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { wxLevelConfigMapper.deleteAll(); } - - - - - - - - + + @Override + public String getLevel(String tenantId, int score) { + return wxLevelConfigMapper.getLevel(tenantId,score); + } + + } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxScoreRulesServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxScoreRulesServiceImpl.java index e7f57d766..c5e12301c 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxScoreRulesServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxScoreRulesServiceImpl.java @@ -3,8 +3,12 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.simple.domain.po.WxCUser; +import com.simple.domain.po.WxCUserBasicInfo; import com.simple.domain.po.WxScoreRules; import com.simple.mapper.WxScoreRulesMapper; +import com.simple.service.WxCUserBasicInfoService; +import com.simple.service.WxCUserService; import com.simple.service.WxScoreRulesService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -15,6 +19,10 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { @Autowired WxScoreRulesMapper wxScoreRulesMapper; + @Autowired + WxCUserService wxCUserService; + @Autowired + WxCUserBasicInfoService wxCUserBasicInfoService; @Override @@ -43,12 +51,43 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { public void deleteById(Long id) { wxScoreRulesMapper.deleteByPrimaryKey(id); } - - - - - - - - + + @Override + public int addScoreByType(String tenantId, int type, Long cUserId) { + int addScoreNumber=0; + WxScoreRules scoreRules = new WxScoreRules(); + scoreRules.setTenantId(tenantId); + List list = wxScoreRulesMapper.findList(scoreRules); + if(list.isEmpty()){ + return addScoreNumber; + } + scoreRules = list.get(0); + + if(type==1){ + //login处理 + addScoreNumber = scoreRules.getLoginScoreNumber(); + } + if(type==2){ + //消费 + addScoreNumber = scoreRules.getConsumptionScoreNumber(); + } + WxCUser wxCUser = wxCUserService.getById(cUserId); + wxCUser.setScore(wxCUser.getScore()+addScoreNumber); + wxCUserService.saveOrUpdate(wxCUser); + + + //修改basic表积分 + if(wxCUser.getPhone()!=null){ + //修改basic表积分 + WxCUserBasicInfo wxCUserBasicInfo = new WxCUserBasicInfo(); + wxCUserBasicInfo.setTenantId(tenantId); + wxCUserBasicInfo.setPhone(wxCUser.getPhone()); + wxCUserBasicInfo.setPoins(wxCUser.getScore()); + wxCUserBasicInfo.setCUserId(wxCUser.getId()); + wxCUserBasicInfoService.updateScore(wxCUserBasicInfo); + } + return addScoreNumber; + } + + } diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index 850d3fb0b..d26af8a36 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -132,6 +132,12 @@ + + update wx_c_user_basic_info set poins=#{poins} where phone=#{phone} and tenant_id=#{tenantId} + and c_user_id=#{cUserId} + + + diff --git a/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml index e7fdb3570..c27ff7326 100644 --- a/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml @@ -63,7 +63,10 @@ delete from wx_level_config; - + + From 5eca37171f6a155a8c26fd7a4eb8832d7297e3ae Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 25 Aug 2018 12:39:23 +0800 Subject: [PATCH 41/58] =?UTF-8?q?[=E8=BD=A6=E6=B5=81][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=95=86=E6=88=B7=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/simple/controller/WxMerchantController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java index 2d9e31e61..15993fb3c 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java @@ -38,6 +38,7 @@ public class WxMerchantController extends BaseController { @GetMapping("etcplist") public ResultData etcpList(@ModelAttribute WxMerchant wxMerchant) { if (null == wxMerchant) wxMerchant = new WxMerchant(); + wxMerchant.setTenantId(getTenantId()); final List merchantList = wxMerchantService.etcpList(wxMerchant); return new ResultData(merchantList); } From 39cfb5df5dc54fcdc96eb392e4e7a01cde16f150 Mon Sep 17 00:00:00 2001 From: hupeng Date: Sat, 25 Aug 2018 12:50:05 +0800 Subject: [PATCH 42/58] =?UTF-8?q?[B=E7=AB=AF][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0b=E7=AB=AF=E5=88=B8=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/simple/domain/po/WxMerchantBUser.java | 8 +- .../simple/domain/vo/WxCouponOrderBVo.java | 20 ++++ .../simple/mapper/WxCouponOrderMapper.java | 4 + .../impl/WxCouponOrderServiceImpl.java | 4 +- .../resources/mapper/WxCouponOrderMapper.xml | 96 ++++++++++++++++--- 5 files changed, 115 insertions(+), 17 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMerchantBUser.java b/mallinkService/src/main/java/com/simple/domain/po/WxMerchantBUser.java index 660f0b46a..f1c671ba6 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMerchantBUser.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMerchantBUser.java @@ -73,11 +73,11 @@ public class WxMerchantBUser implements Serializable { /*用户过期时间**/ @io.swagger.annotations.ApiModelProperty(value="用户过期时间",name="expireTime") private Date expireTime; - - @io.swagger.annotations.ApiModelProperty(value="name",name="name") + /*b端用户姓名**/ + @io.swagger.annotations.ApiModelProperty(value="b端用户姓名",name="name") private String name; - - @io.swagger.annotations.ApiModelProperty(value="删除状态1删除0未删除",name="status") + /*绑定状态1未绑定商户0已绑定商户**/ + @io.swagger.annotations.ApiModelProperty(value="绑定状态1未绑定商户0已绑定商户",name="status") private Integer status; diff --git a/mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderBVo.java b/mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderBVo.java index ec3f0f626..232d643a4 100644 --- a/mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderBVo.java +++ b/mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderBVo.java @@ -92,6 +92,14 @@ public class WxCouponOrderBVo extends WxCouponOrder{ private Integer price; + /*b端用户姓名**/ + @io.swagger.annotations.ApiModelProperty(value="b端用户姓名",name="bUserName") + private String bUserName; + + /*c用户绑定的手机号**/ + @io.swagger.annotations.ApiModelProperty(value="用户绑定的手机号",name="cUserPhone") + private String cUserPhone; + public String getTenantId() { return tenantId; } @@ -185,7 +193,19 @@ public class WxCouponOrderBVo extends WxCouponOrder{ price = _price; } + public String getCUserPhone() { + return cUserPhone; + } + public void setCUserPhone(String _phone) { + cUserPhone = _phone; + } + public String getBUserName() { + return bUserName; + } + public void setBUserName(String _name) { + this.bUserName = _name; + } public static enum Field { Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java index 0d6c5b0ea..27a936815 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java @@ -2,6 +2,7 @@ package com.simple.mapper; import java.util.*; import com.simple.common.CommonMapper; +import com.simple.domain.vo.WxCouponOrderBVo; import com.simple.domain.vo.WxCouponOrderCVo; import org.apache.ibatis.annotations.Param; import com.simple.domain.po.WxCouponOrder; @@ -13,6 +14,9 @@ public interface WxCouponOrderMapper extends CommonMapper { List findListOfUnverifiedByDate(Map dateMap); List findListOfVerifiedByDate(Map dateMap); + List findListOfUnverifiedByDateForBUser(Map dateMap); + List findListOfVerifiedByDateForBUser(Map dateMap); + List findListOfCUser(Map paramMap); WxCouponOrderCVo selectDetailOfCUser(Map paramMap); } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java index a8561aba9..869aeb26b 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java @@ -141,9 +141,9 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } else { if (isVerified) - resultMap.put("list", PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfVerifiedByDate(dateMap))); + resultMap.put("list", PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfVerifiedByDateForBUser(dateMap))); else - resultMap.put("list", PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfUnverifiedByDate(dateMap))); + resultMap.put("list", PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfUnverifiedByDateForBUser(dateMap))); } return new ResultData(resultMap); } diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 8d1678ccd..0f335fc96 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -92,35 +92,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + co.id,co.tenant_id,co.coupon_id,co.c_user_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price, + c.type,c.title,c.sale_price,c.use_price,c.price, + bu.name,cu.phone + + + + co.id,co.tenant_id,co.coupon_id,co.c_user_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price, + c.type,c.title,c.sale_price,c.use_price,c.price, + cu.phone + - c.id,c.tenant_id,c.coupon_id,c.c_user_id,c.b_user_id,c.order_id,c.expired_time,c.coupon_order_status,c.create_date,c.update_date,c.coupon_price + co.id,co.tenant_id,co.coupon_id,co.c_user_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price + + + + + From a887ab37657fec1a237838e75e34cfaa92a35818 Mon Sep 17 00:00:00 2001 From: hupeng Date: Sat, 25 Aug 2018 13:52:26 +0800 Subject: [PATCH 43/58] =?UTF-8?q?[=E7=B3=BB=E7=BB=9F][=E5=88=A0=E9=99=A4]:?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=B7=B2=E7=BB=8F=E4=B8=8D=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E7=9A=84verifycoupon=E7=9B=B8=E5=85=B3=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCouponVerifyController.java | 82 ------- .../simple/controller/WxCouponController.java | 1 - .../controller/WxCouponVerifyController.java | 71 ------- .../com/simple/domain/po/WxCouponVerify.java | 201 ------------------ .../simple/mapper/WxCouponVerifyMapper.java | 17 -- .../simple/service/WxCouponVerifyService.java | 48 ----- .../impl/WxCouponVerifyServiceImpl.java | 54 ----- .../impl/WxRefundOrderServiceImpl.java | 3 - .../resources/mapper/WxCouponVerifyMapper.xml | 98 --------- 9 files changed, 575 deletions(-) delete mode 100644 mallinkAdmin/src/main/java/com/simple/controller/WxCouponVerifyController.java delete mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxCouponVerifyController.java delete mode 100644 mallinkService/src/main/java/com/simple/domain/po/WxCouponVerify.java delete mode 100644 mallinkService/src/main/java/com/simple/mapper/WxCouponVerifyMapper.java delete mode 100644 mallinkService/src/main/java/com/simple/service/WxCouponVerifyService.java delete mode 100644 mallinkService/src/main/java/com/simple/service/impl/WxCouponVerifyServiceImpl.java delete mode 100644 mallinkService/src/main/resources/mapper/WxCouponVerifyMapper.xml diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponVerifyController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponVerifyController.java deleted file mode 100644 index 9e778e87e..000000000 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponVerifyController.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.simple.controller; - -import com.simple.domain.po.MallUserInfo; -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.WxCouponVerify; -import com.simple.service.WxCouponVerifyService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxCouponVerify") -public class WxCouponVerifyController extends BaseController -{ - @Autowired - private WxCouponVerifyService wxCouponVerifyService; - - private Logger logger = Logger.getLogger(WxCouponVerifyController.class); - - @ApiOperation("分页列表接口") - @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxCouponVerify wxCouponVerify,Integer pageNum, Integer pageSize) { - if (null == wxCouponVerify) wxCouponVerify = new WxCouponVerify(); - final PageInfo page = wxCouponVerifyService.listAsPage(wxCouponVerify, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxCouponVerify wxCouponVerify) { - //Assert.notNull(wxCouponVerify.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxCouponVerifyService.saveOrUpdate(wxCouponVerify); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxCouponVerify wxCouponVerify) { - wxCouponVerifyService.saveOrUpdate(wxCouponVerify); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData delete(Long id) { - wxCouponVerifyService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxCouponVerifyService.getById(id)); - } - - @ApiOperation("根据id更新接口") - @PostMapping("verify") - public ResultData verify(@RequestBody WxCouponVerify wxCouponVerify) { - MallUserInfo user =getUser(); - wxCouponVerify.setBUserId(user.getId()); - wxCouponVerify.setTenantId(user.getTenantId()); - wxCouponVerifyService.saveOrUpdate(wxCouponVerify); - return new ResultData(); - } - - - -} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCouponController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCouponController.java index 263c602c3..f51961810 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxCouponController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCouponController.java @@ -42,5 +42,4 @@ public class WxCouponController extends BaseController { return new ResultData(Result.SUCCESS, "查询成功", wxCouponService.getById(id)); } - } diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCouponVerifyController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCouponVerifyController.java deleted file mode 100644 index 95b91de39..000000000 --- a/mallinkCApi/src/main/java/com/simple/controller/WxCouponVerifyController.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.simple.controller; - -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.WxCouponVerify; -import com.simple.service.WxCouponVerifyService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxCouponVerify") -public class WxCouponVerifyController extends BaseController -{ - @Autowired - private WxCouponVerifyService wxCouponVerifyService; - - private Logger logger = Logger.getLogger(WxCouponVerifyController.class); - - @ApiOperation("分页列表接口") - @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxCouponVerify wxCouponVerify,Integer pageNum, Integer pageSize) { - if (null == wxCouponVerify) wxCouponVerify = new WxCouponVerify(); - final PageInfo page = wxCouponVerifyService.listAsPage(wxCouponVerify, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxCouponVerify wxCouponVerify) { - //Assert.notNull(wxCouponVerify.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxCouponVerifyService.saveOrUpdate(wxCouponVerify); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxCouponVerify wxCouponVerify) { - wxCouponVerifyService.saveOrUpdate(wxCouponVerify); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData delete(Long id) { - wxCouponVerifyService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxCouponVerifyService.getById(id)); - } - - - -} diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCouponVerify.java b/mallinkService/src/main/java/com/simple/domain/po/WxCouponVerify.java deleted file mode 100644 index 12f6d48f5..000000000 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCouponVerify.java +++ /dev/null @@ -1,201 +0,0 @@ -package com.simple.domain.po; - -import javax.persistence.*; -import java.util.*; -import java.math.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; -import java.io.Serializable; - -@Table(name = "wx_coupon_verify") -public class WxCouponVerify implements Serializable { - private static final long serialVersionUID = 1L; - - @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; - } - - - - /*租户ID**/ - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; - /*coupon id**/ - @io.swagger.annotations.ApiModelProperty(value="coupon id",name="couponId") - private Long couponId; - /*订单id**/ - @io.swagger.annotations.ApiModelProperty(value="订单id",name="orderId") - private Long orderId; - /*c端用户id**/ - @io.swagger.annotations.ApiModelProperty(value="c端用户id",name="cUserId") - private Long cUserId; - /*购买日期/领取日期**/ - @io.swagger.annotations.ApiModelProperty(value="购买日期/领取日期",name="buyDate") - private Date buyDate; - /*截止日期**/ - @io.swagger.annotations.ApiModelProperty(value="截止日期",name="limitDate") - private Date limitDate; - /*c状态(0:default,1:未支付,2:已支付/已领取,3:已使用,4:已退回/已退券)**/ - @io.swagger.annotations.ApiModelProperty(value="c状态(0:default,1:未支付,2:已支付/已领取,3:已使用,4:已退回/已退券)",name="cStatus") - private Integer cStatus; - /*b端用户id**/ - @io.swagger.annotations.ApiModelProperty(value="b端用户id",name="bUserId") - private Long bUserId; - /*核销日期**/ - @io.swagger.annotations.ApiModelProperty(value="核销日期",name="verificationDate") - private Date verificationDate; - /*核销状态(0:未核销,1:已核销)**/ - @io.swagger.annotations.ApiModelProperty(value="核销状态(0:未核销,1:已核销)",name="verificationStatus") - private Integer verificationStatus; - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - public Long getCouponId() { - return couponId; - } - public void setCouponId(Long _couponId) { - couponId = _couponId; - } - public Long getOrderId() { - return orderId; - } - public void setOrderId(Long _orderId) { - orderId = _orderId; - } - public Long getCUserId() { - return cUserId; - } - public void setCUserId(Long _cUserId) { - cUserId = _cUserId; - } - public Date getBuyDate() { - return buyDate; - } - public void setBuyDate(Date _buyDate) { - buyDate = _buyDate; - } - public Date getLimitDate() { - return limitDate; - } - public void setLimitDate(Date _limitDate) { - limitDate = _limitDate; - } - public Integer getCStatus() { - return cStatus; - } - public void setCStatus(Integer _cStatus) { - cStatus = _cStatus; - } - public Long getBUserId() { - return bUserId; - } - public void setBUserId(Long _bUserId) { - bUserId = _bUserId; - } - public Date getVerificationDate() { - return verificationDate; - } - public void setVerificationDate(Date _verificationDate) { - verificationDate = _verificationDate; - } - public Integer getVerificationStatus() { - return verificationStatus; - } - public void setVerificationStatus(Integer _verificationStatus) { - verificationStatus = _verificationStatus; - } - - - - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") - ,CouponId_ASC("`couponId` ASC"),CouponId_DESC("`couponId` DESC") - ,OrderId_ASC("`orderId` ASC"),OrderId_DESC("`orderId` DESC") - ,CUserId_ASC("`cUserId` ASC"),CUserId_DESC("`cUserId` DESC") - ,BuyDate_ASC("`buyDate` ASC"),BuyDate_DESC("`buyDate` DESC") - ,LimitDate_ASC("`limitDate` ASC"),LimitDate_DESC("`limitDate` DESC") - ,CStatus_ASC("`cStatus` ASC"),CStatus_DESC("`cStatus` DESC") - ,BUserId_ASC("`bUserId` ASC"),BUserId_DESC("`bUserId` DESC") - ,VerificationDate_ASC("`verificationDate` ASC"),VerificationDate_DESC("`verificationDate` DESC") - ,VerificationStatus_ASC("`verificationStatus` ASC"),VerificationStatus_DESC("`verificationStatus` 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(WxCouponVerify.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(Field.valueOf(cols[k])); - } - this.setSortColumns(fList.toArray(new Field[fList.size()])); - } else { - this.setSortColumns(Field.valueOf(sortColumns)); - } - } -} diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCouponVerifyMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCouponVerifyMapper.java deleted file mode 100644 index 01786d1ee..000000000 --- a/mallinkService/src/main/java/com/simple/mapper/WxCouponVerifyMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.simple.mapper; - -import java.util.*; -import com.simple.common.CommonMapper; -import org.apache.ibatis.annotations.Param; -import com.simple.domain.po.WxCouponVerify; - -public interface WxCouponVerifyMapper extends CommonMapper { - - List findList(WxCouponVerify wxCouponVerify); - - - - - - -} diff --git a/mallinkService/src/main/java/com/simple/service/WxCouponVerifyService.java b/mallinkService/src/main/java/com/simple/service/WxCouponVerifyService.java deleted file mode 100644 index 03b371e26..000000000 --- a/mallinkService/src/main/java/com/simple/service/WxCouponVerifyService.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.simple.service; - -import java.util.*; -import com.github.pagehelper.PageInfo; -import com.simple.domain.po.WxCouponVerify; - -public interface WxCouponVerifyService { - - /** - * 根据实体查询分页列表 - * - * @param record - * @param offset - * @param limit - * @return - */ - PageInfo listAsPage(WxCouponVerify record, Integer pageIndex, Integer pageSize); - - /** - * 根据Id获得实体 - * - * @param id - * @return - */ - WxCouponVerify getById(Long id); - - /** - * 保存或更新实体 - * - * @param record - */ - void saveOrUpdate(WxCouponVerify record); - - /** - * 根据Id删除实体 - * - * @param id - */ - void deleteById(Long id); - - - - - - - - -} diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponVerifyServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponVerifyServiceImpl.java deleted file mode 100644 index 3ab97542a..000000000 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponVerifyServiceImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.simple.service.impl; - -import java.util.*; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.simple.domain.po.WxCouponVerify; -import com.simple.mapper.WxCouponVerifyMapper; -import com.simple.service.WxCouponVerifyService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.simple.common.IdWorker; - -@Service -public class WxCouponVerifyServiceImpl implements WxCouponVerifyService { - - @Autowired - WxCouponVerifyMapper wxCouponVerifyMapper; - - - @Override - public PageInfo listAsPage(WxCouponVerify record, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponVerifyMapper.findList(record)); - } - - @Override - public WxCouponVerify getById(Long id) { - return wxCouponVerifyMapper.selectByPrimaryKey(id); - } - - @Override - public void saveOrUpdate(WxCouponVerify record) { - if (record.getId() == null) { - //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - final IdWorker idWorker = IdWorker.get(); - record.setId(idWorker.nextId()); - wxCouponVerifyMapper.insertSelective(record); - } else { - wxCouponVerifyMapper.updateByPrimaryKeySelective(record); - } - } - - @Override - public void deleteById(Long id) { - wxCouponVerifyMapper.deleteByPrimaryKey(id); - } - - - - - - - - -} diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxRefundOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxRefundOrderServiceImpl.java index 4731a8889..053739db5 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxRefundOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxRefundOrderServiceImpl.java @@ -41,9 +41,6 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { @Autowired WxRefundOrderMapper wxRefundOrderMapper; - @Autowired - WxCouponVerifyMapper wxCouponVerifyMapper; - @Autowired WxOrderMapper wxOrderMapper; diff --git a/mallinkService/src/main/resources/mapper/WxCouponVerifyMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponVerifyMapper.xml deleted file mode 100644 index ef79ffe66..000000000 --- a/mallinkService/src/main/resources/mapper/WxCouponVerifyMapper.xml +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - - `id`,`tenant_id`,`coupon_id`,`order_id`,`c_user_id`,`buy_date`,`limit_date`,`c_status`,`b_user_id`,`verification_date`,`verification_status` - - - - where 1 = 1 - - - and `id` = #{id} - - - - - and `tenant_id` like concat('%', #{tenantId},'%') - - - - - and `coupon_id` = #{couponId} - - - - - and `order_id` = #{orderId} - - - - - and `c_user_id` = #{cUserId} - - - - - and `buy_date` = #{buyDate} - - - - - and `limit_date` = #{limitDate} - - - - - and `c_status` = #{cStatus} - - - - - and `b_user_id` = #{bUserId} - - - - - and `verification_date` = #{verificationDate} - - - - - and `verification_status` = #{verificationStatus} - - - - and id in - - #{idItem} - - - order by ${sortColumns} - - - - - - - - - - From 6f6aa2160519da8cfe28a6318d94b5d7913563e6 Mon Sep 17 00:00:00 2001 From: masterspirit Date: Sat, 25 Aug 2018 14:30:27 +0800 Subject: [PATCH 44/58] =?UTF-8?q?[=E6=A0=87=E7=AD=BE][=E4=BF=AE=E6=94=B9]?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E6=A0=87=E7=AD=BE=E6=9F=A5=E6=89=BE=E7=94=A8?= =?UTF-8?q?=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/simple/mapper/WxCUserTagsMapper.java | 5 +++++ .../com/simple/service/impl/CouponInjectServiceImpl.java | 3 +++ .../com/simple/service/impl/WxCUserTagsServiceImpl.java | 7 +++++-- .../src/main/resources/mapper/WxCUserTagsMapper.xml | 8 ++++++++ 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCUserTagsMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCUserTagsMapper.java index f79fd58db..e31b4c361 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCUserTagsMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCUserTagsMapper.java @@ -4,6 +4,7 @@ import java.util.List; import com.simple.common.CommonMapper; import com.simple.domain.po.WxCUserTags; +import org.apache.ibatis.annotations.Param; public interface WxCUserTagsMapper extends CommonMapper { @@ -12,5 +13,9 @@ public interface WxCUserTagsMapper extends CommonMapper { long findCountByTag(List tagIds); List findUserByTag(List tagIds); + + long findCountByTags(@Param("tagIds")String tagIds); + + List findUserByTags(@Param("tagIds")String tagIds); } 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 5c6b61931..fede7ef0f 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/CouponInjectServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/CouponInjectServiceImpl.java @@ -90,6 +90,9 @@ public class CouponInjectServiceImpl implements CouponInjectService { record.setStatus(0); } List cUsers = wxCUserTagsService.findUserByTag(tagids); + if(cUsers.isEmpty()){ + return new ResultData(Result.ERROR,"标签下没有用户"); + } int inventory = wxCoupon.getRemainInventory();//库存数量 if(cUsers.size()>inventory){ return new ResultData(Result.ERROR,"库存不足"); diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCUserTagsServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCUserTagsServiceImpl.java index ae8affe28..5825b3e08 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCUserTagsServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCUserTagsServiceImpl.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.alibaba.fastjson.JSON; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -62,12 +63,14 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { @Override public long findCountByTag(List tagIds) { - return wxCUserTagsMapper.findCountByTag(tagIds); + String str = JSON.toJSONString(tagIds); + return wxCUserTagsMapper.findCountByTags(str); } @Override public List findUserByTag(List tagIds) { - List userIds = wxCUserTagsMapper.findUserByTag(tagIds); + String str = JSON.toJSONString(tagIds); + List userIds = wxCUserTagsMapper.findUserByTags(str); if(userIds.size()==0) { return new ArrayList<>(); } diff --git a/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml index 3538ebf41..1225b888e 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml @@ -67,5 +67,13 @@ + + + + From 67b3289c7376c30089e93d3ea7c79cf718420733 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 25 Aug 2018 14:38:18 +0800 Subject: [PATCH 45/58] =?UTF-8?q?[webPV][=E6=96=B0=E5=A2=9E]:PV=20?= =?UTF-8?q?=E8=AE=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...troller.java => WxAdminLogController.java} | 46 +++++++----- .../po/{WxWebLog.java => WxAdminLog.java} | 65 +++++++++++------ .../com/simple/mapper/WxAdminLogMapper.java | 17 +++++ ...LogService.java => WxAdminLogService.java} | 18 +++-- .../service/impl/WxAdminLogServiceImpl.java | 72 +++++++++++++++++++ .../service/impl/WxWebLogServiceImpl.java | 54 -------------- .../java/com/simple/utils/BaseConstant.java | 4 +- ...xWebLogMapper.xml => WxAdminLogMapper.xml} | 34 ++++++--- 8 files changed, 196 insertions(+), 114 deletions(-) rename mallinkAdmin/src/main/java/com/simple/controller/{WxWebLogController.java => WxAdminLogController.java} (53%) rename mallinkService/src/main/java/com/simple/domain/po/{WxWebLog.java => WxAdminLog.java} (60%) create mode 100644 mallinkService/src/main/java/com/simple/mapper/WxAdminLogMapper.java rename mallinkService/src/main/java/com/simple/service/{WxWebLogService.java => WxAdminLogService.java} (58%) create mode 100644 mallinkService/src/main/java/com/simple/service/impl/WxAdminLogServiceImpl.java delete mode 100644 mallinkService/src/main/java/com/simple/service/impl/WxWebLogServiceImpl.java rename mallinkService/src/main/resources/mapper/{WxWebLogMapper.xml => WxAdminLogMapper.xml} (50%) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxWebLogController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxAdminLogController.java similarity index 53% rename from mallinkAdmin/src/main/java/com/simple/controller/WxWebLogController.java rename to mallinkAdmin/src/main/java/com/simple/controller/WxAdminLogController.java index a74b33363..f3aff2d73 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxWebLogController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxAdminLogController.java @@ -1,5 +1,6 @@ package com.simple.controller; +import com.simple.domain.po.MallUserInfo; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.Assert; @@ -9,45 +10,47 @@ import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; -import com.simple.domain.po.WxWebLog; -import com.simple.service.WxWebLogService; +import com.simple.domain.po.WxAdminLog; +import com.simple.service.WxAdminLogService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @RestController -@RequestMapping("wxWebLog") -public class WxWebLogController extends BaseController +@RequestMapping("wxAdminLog") +public class WxAdminLogController extends BaseController { @Autowired - private WxWebLogService wxWebLogService; + private WxAdminLogService wxAdminLogService; - private Logger logger = Logger.getLogger(WxWebLogController.class); + private Logger logger = Logger.getLogger(WxAdminLogController.class); @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxWebLog wxWebLog,Integer pageNum, Integer pageSize) { - if (null == wxWebLog) wxWebLog = new WxWebLog(); - final PageInfo page = wxWebLogService.listAsPage(wxWebLog, pageNum, pageSize); + public ResultData list(@ModelAttribute WxAdminLog wxAdminLog,Integer pageNum, Integer pageSize) { + if (null == wxAdminLog) wxAdminLog = new WxAdminLog(); + final PageInfo page = wxAdminLogService.listAsPage(wxAdminLog, pageNum, pageSize); return new ResultData(page); } @ApiOperation("新增接口") @PostMapping("add") - public ResultData add(@RequestBody WxWebLog wxWebLog) { - //Assert.notNull(wxWebLog.getName(), "角色名不能为空"); + public ResultData add(@RequestBody WxAdminLog wxAdminLog) { + //Assert.notNull(wxAdminLog.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxWebLogService.saveOrUpdate(wxWebLog); + wxAdminLogService.saveOrUpdate(wxAdminLog); return new ResultData(); } @ApiOperation("根据id更新接口") @PostMapping("update") - public ResultData update(@RequestBody WxWebLog wxWebLog) { - wxWebLogService.saveOrUpdate(wxWebLog); + public ResultData update(@RequestBody WxAdminLog wxAdminLog) { + String tenantId = getTenantId(); + wxAdminLog.setTenantId(tenantId); + wxAdminLogService.saveOrUpdate(wxAdminLog); return new ResultData(); } @@ -55,7 +58,7 @@ public class WxWebLogController extends BaseController @GetMapping("/del") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData delete(Long id) { - wxWebLogService.deleteById(id); + wxAdminLogService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -63,9 +66,16 @@ public class WxWebLogController extends BaseController @GetMapping("/findById") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxWebLogService.getById(id)); + return new ResultData(Result.SUCCESS,"查询成功",wxAdminLogService.getById(id)); + } + + @ApiOperation("PV计数") + @PostMapping("pvlog") + public ResultData pvLog(@RequestBody WxAdminLog wxAdminLog) { + String tenantId = getTenantId(); + wxAdminLog.setTenantId(tenantId); + wxAdminLogService.saveLogCount(wxAdminLog); + return new ResultData(); } - - } diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxWebLog.java b/mallinkService/src/main/java/com/simple/domain/po/WxAdminLog.java similarity index 60% rename from mallinkService/src/main/java/com/simple/domain/po/WxWebLog.java rename to mallinkService/src/main/java/com/simple/domain/po/WxAdminLog.java index d943577bf..ac43fab10 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxWebLog.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxAdminLog.java @@ -8,15 +8,15 @@ import java.util.List; import javax.persistence.Id; import java.io.Serializable; -@Table(name = "wx_web_log") -public class WxWebLog implements Serializable { +@Table(name = "wx_admin_log") +public class WxAdminLog implements Serializable { private static final long serialVersionUID = 1L; @Id protected Long id; @Transient - protected List ids; + protected List ids; @Transient protected String sortColumns; @@ -32,10 +32,11 @@ public class WxWebLog implements Serializable { return sortColumns; } - public List getIds() { + public List getIds() { return ids; } - public void setIds(List ids) { + + public void setIds(List ids) { this.ids = ids; } @@ -44,29 +45,47 @@ public class WxWebLog implements Serializable { /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; - /***/ - @io.swagger.annotations.ApiModelProperty(value="",name="data") - private String data; - /*创建时间**/ - @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") - private Date createDate; + /*网址**/ + @io.swagger.annotations.ApiModelProperty(value="网址",name="url") + private String url; + /*时间**/ + @io.swagger.annotations.ApiModelProperty(value="时间",name="actionDate") + private String actionDate; + /*1. pv 2. uv**/ + @io.swagger.annotations.ApiModelProperty(value="1. pv 2. uv",name="type") + private Integer type; + /*计数**/ + @io.swagger.annotations.ApiModelProperty(value="计数",name="count") + private Integer count; public String getTenantId() { return tenantId; } public void setTenantId(String _tenantId) { tenantId = _tenantId; } - public String getData() { - return data; + public String getUrl() { + return url; + } + public void setUrl(String _url) { + url = _url; + } + public String getActionDate() { + return actionDate; + } + public void setActionDate(String _actionDate) { + actionDate = _actionDate; + } + public Integer getType() { + return type; } - public void setData(String _data) { - data = _data; + public void setType(Integer _type) { + type = _type; } - public Date getCreateDate() { - return createDate; + public Integer getCount() { + return count; } - public void setCreateDate(Date _createDate) { - createDate = _createDate; + public void setCount(Integer _count) { + count = _count; } @@ -75,8 +94,10 @@ public class WxWebLog implements Serializable { { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") - ,Data_ASC("`data` ASC"),Data_DESC("`data` DESC") - ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") + ,Url_ASC("`url` ASC"),Url_DESC("`url` DESC") + ,ActionDate_ASC("`actionDate` ASC"),ActionDate_DESC("`actionDate` DESC") + ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") + ,Count_ASC("`count` ASC"),Count_DESC("`count` DESC") ; private String value; Field(String value){ @@ -94,7 +115,7 @@ public class WxWebLog implements Serializable { } } - public void setSortColumns(WxWebLog.Field... fields) + public void setSortColumns(WxAdminLog.Field... fields) { if (fields == null || fields.length == 0) { return; diff --git a/mallinkService/src/main/java/com/simple/mapper/WxAdminLogMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxAdminLogMapper.java new file mode 100644 index 000000000..ecceb2ea4 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/mapper/WxAdminLogMapper.java @@ -0,0 +1,17 @@ +package com.simple.mapper; + +import java.util.*; +import com.simple.common.CommonMapper; +import org.apache.ibatis.annotations.Param; +import com.simple.domain.po.WxAdminLog; + +public interface WxAdminLogMapper extends CommonMapper { + + List findList(WxAdminLog wxAdminLog); + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/WxWebLogService.java b/mallinkService/src/main/java/com/simple/service/WxAdminLogService.java similarity index 58% rename from mallinkService/src/main/java/com/simple/service/WxWebLogService.java rename to mallinkService/src/main/java/com/simple/service/WxAdminLogService.java index d6fa3181e..13d84dc29 100644 --- a/mallinkService/src/main/java/com/simple/service/WxWebLogService.java +++ b/mallinkService/src/main/java/com/simple/service/WxAdminLogService.java @@ -2,19 +2,19 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.domain.po.WxWebLog; +import com.simple.domain.po.WxAdminLog; -public interface WxWebLogService { +public interface WxAdminLogService { /** * 根据实体查询分页列表 * * @param record - * @param offset - * @param limit + * @param pageIndex + * @param pageSize * @return */ - PageInfo listAsPage(WxWebLog record, Integer pageIndex, Integer pageSize); + PageInfo listAsPage(WxAdminLog record, Integer pageIndex, Integer pageSize); /** * 根据Id获得实体 @@ -22,14 +22,14 @@ public interface WxWebLogService { * @param id * @return */ - WxWebLog getById(Long id); + WxAdminLog getById(Long id); /** * 保存或更新实体 * * @param record */ - void saveOrUpdate(WxWebLog record); + void saveOrUpdate(WxAdminLog record); /** * 根据Id删除实体 @@ -37,6 +37,10 @@ public interface WxWebLogService { * @param id */ void deleteById(Long id); + + + + void saveLogCount(WxAdminLog record); diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxAdminLogServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxAdminLogServiceImpl.java new file mode 100644 index 000000000..0eaa59a0b --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/impl/WxAdminLogServiceImpl.java @@ -0,0 +1,72 @@ +package com.simple.service.impl; + +import java.util.*; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.simple.domain.po.WxAdminLog; +import com.simple.mapper.WxAdminLogMapper; +import com.simple.service.WxAdminLogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.simple.common.IdWorker; + +@Service +public class WxAdminLogServiceImpl implements WxAdminLogService { + + @Autowired + WxAdminLogMapper wxAdminLogMapper; + + + @Override + public PageInfo listAsPage(WxAdminLog record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxAdminLogMapper.findList(record)); + } + + @Override + public WxAdminLog getById(Long id) { + return wxAdminLogMapper.selectByPrimaryKey(id); + } + + @Override + public void saveOrUpdate(WxAdminLog record) { + if (record.getId() == null) { + //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); + final IdWorker idWorker = IdWorker.get(); + record.setId(idWorker.nextId()); + wxAdminLogMapper.insertSelective(record); + } else { + wxAdminLogMapper.updateByPrimaryKeySelective(record); + } + } + + @Override + public void deleteById(Long id) { + wxAdminLogMapper.deleteByPrimaryKey(id); + } + + @Override + public void saveLogCount(WxAdminLog record) { + // TODO use redis to optimize + WxAdminLog reqQ = new WxAdminLog(); + reqQ.setTenantId(record.getTenantId()); + reqQ.setUrl(record.getUrl()); + reqQ.setType(record.getType()); + reqQ.setActionDate(record.getActionDate()); + List logList = wxAdminLogMapper.select(reqQ); + if (logList.size() > 0) { + WxAdminLog log = logList.get(0); + log.setCount(log.getCount() + 1); + wxAdminLogMapper.updateByPrimaryKeySelective(record); + } else { + final IdWorker idWorker = IdWorker.get(); + reqQ.setId(idWorker.nextId()); + reqQ.setCount(1); + wxAdminLogMapper.insertSelective(reqQ); + } + } + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxWebLogServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxWebLogServiceImpl.java deleted file mode 100644 index ac3e59c9b..000000000 --- a/mallinkService/src/main/java/com/simple/service/impl/WxWebLogServiceImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.simple.service.impl; - -import java.util.*; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.simple.domain.po.WxWebLog; -import com.simple.mapper.WxWebLogMapper; -import com.simple.service.WxWebLogService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.simple.common.IdWorker; - -@Service -public class WxWebLogServiceImpl implements WxWebLogService { - - @Autowired - WxWebLogMapper wxWebLogMapper; - - - @Override - public PageInfo listAsPage(WxWebLog record, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxWebLogMapper.findList(record)); - } - - @Override - public WxWebLog getById(Long id) { - return wxWebLogMapper.selectByPrimaryKey(id); - } - - @Override - public void saveOrUpdate(WxWebLog record) { - if (record.getId() == null) { - //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - final IdWorker idWorker = IdWorker.get(); - record.setId(idWorker.nextId()); - wxWebLogMapper.insertSelective(record); - } else { - wxWebLogMapper.updateByPrimaryKeySelective(record); - } - } - - @Override - public void deleteById(Long id) { - wxWebLogMapper.deleteByPrimaryKey(id); - } - - - - - - - - -} diff --git a/mallinkService/src/main/java/com/simple/utils/BaseConstant.java b/mallinkService/src/main/java/com/simple/utils/BaseConstant.java index 11fc91c29..dbc1b6018 100644 --- a/mallinkService/src/main/java/com/simple/utils/BaseConstant.java +++ b/mallinkService/src/main/java/com/simple/utils/BaseConstant.java @@ -2,6 +2,6 @@ package com.simple.utils; public class BaseConstant { - //12小时后过期 - public final static int EXPIRE = 3600 * 12; + //24小时后过期 + public final static int EXPIRE = 3600 * 24; } diff --git a/mallinkService/src/main/resources/mapper/WxWebLogMapper.xml b/mallinkService/src/main/resources/mapper/WxAdminLogMapper.xml similarity index 50% rename from mallinkService/src/main/resources/mapper/WxWebLogMapper.xml rename to mallinkService/src/main/resources/mapper/WxAdminLogMapper.xml index 6b3dc6c71..ab4f81a0c 100644 --- a/mallinkService/src/main/resources/mapper/WxWebLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAdminLogMapper.xml @@ -1,15 +1,17 @@ - - + + - - + + + + - `id`,`tenant_id`,`data`,`create_date` + `id`,`tenant_id`,`url`,`action_date`,`type`,`count` @@ -25,13 +27,23 @@ - - and `data` like concat('%', #{data},'%') + + and `url` like concat('%', #{url},'%') - - and `create_date` = #{createDate} + + and `action_date` like concat('%', #{actionDate},'%') + + + + + and `type` = #{type} + + + + + and `count` = #{count} @@ -43,8 +55,8 @@ order by ${sortColumns} - + select from wx_admin_log From adcb711988b3f74052158ec97cf278eb4651815f Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 25 Aug 2018 14:39:54 +0800 Subject: [PATCH 46/58] =?UTF-8?q?[webPV][=E6=96=B0=E5=A2=9E]:PV=20?= =?UTF-8?q?=E8=AE=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/simple/mapper/WxWebLogMapper.java | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 mallinkService/src/main/java/com/simple/mapper/WxWebLogMapper.java diff --git a/mallinkService/src/main/java/com/simple/mapper/WxWebLogMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxWebLogMapper.java deleted file mode 100644 index 946d07fbc..000000000 --- a/mallinkService/src/main/java/com/simple/mapper/WxWebLogMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.simple.mapper; - -import java.util.*; -import com.simple.common.CommonMapper; -import org.apache.ibatis.annotations.Param; -import com.simple.domain.po.WxWebLog; - -public interface WxWebLogMapper extends CommonMapper { - - List findList(WxWebLog wxWebLog); - - - - - - -} From 6401d5767f28f5ddf7d34124d3dacfffe4372484 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 25 Aug 2018 14:40:50 +0800 Subject: [PATCH 47/58] =?UTF-8?q?[webPV][=E6=96=B0=E5=A2=9E]:PV=20?= =?UTF-8?q?=E8=AE=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/controller/WxWebLogController.java | 71 ------------------- 1 file changed, 71 deletions(-) delete mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxWebLogController.java diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxWebLogController.java b/mallinkCApi/src/main/java/com/simple/controller/WxWebLogController.java deleted file mode 100644 index a74b33363..000000000 --- a/mallinkCApi/src/main/java/com/simple/controller/WxWebLogController.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.simple.controller; - -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.WxWebLog; -import com.simple.service.WxWebLogService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxWebLog") -public class WxWebLogController extends BaseController -{ - @Autowired - private WxWebLogService wxWebLogService; - - private Logger logger = Logger.getLogger(WxWebLogController.class); - - @ApiOperation("分页列表接口") - @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxWebLog wxWebLog,Integer pageNum, Integer pageSize) { - if (null == wxWebLog) wxWebLog = new WxWebLog(); - final PageInfo page = wxWebLogService.listAsPage(wxWebLog, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxWebLog wxWebLog) { - //Assert.notNull(wxWebLog.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxWebLogService.saveOrUpdate(wxWebLog); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxWebLog wxWebLog) { - wxWebLogService.saveOrUpdate(wxWebLog); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData delete(Long id) { - wxWebLogService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxWebLogService.getById(id)); - } - - - -} From 3529acb10a8a5b6803fe34dd29919763a577f1e1 Mon Sep 17 00:00:00 2001 From: masterspirit Date: Sat, 25 Aug 2018 14:52:22 +0800 Subject: [PATCH 48/58] =?UTF-8?q?[=E7=A7=AF=E5=88=86][=E4=BF=AE=E6=94=B9]?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=8E=B7=E5=BE=97=E7=A7=AF=E5=88=86=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E6=94=AF=E4=BB=98=E8=8E=B7=E5=BE=97=E7=A7=AF?= =?UTF-8?q?=E5=88=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/service/WxScoreRulesService.java | 14 ++++-- .../service/impl/WxScoreRulesServiceImpl.java | 50 ++++++++++++++----- 2 files changed, 49 insertions(+), 15 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/service/WxScoreRulesService.java b/mallinkService/src/main/java/com/simple/service/WxScoreRulesService.java index 66251b8b2..efc495e9b 100644 --- a/mallinkService/src/main/java/com/simple/service/WxScoreRulesService.java +++ b/mallinkService/src/main/java/com/simple/service/WxScoreRulesService.java @@ -38,13 +38,21 @@ public interface WxScoreRulesService { */ void deleteById(Long id); /** - * 登录或消费 调用增长积分 + * 登录 调用增长积分 * @param tenantId - * @param type 1:登录 2:消费 * @param cUserId * @return 新增的积分值 */ - int addScoreByType(String tenantId,int type,Long cUserId); + int loginAddScore(String tenantId,Long cUserId); + + /** + * + * @param tenantId + * @param cUserId + * @param payPrice 实际支付金额(分) + * @return + */ + int payAddScore(String tenantId,Long cUserId,int payPrice); diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxScoreRulesServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxScoreRulesServiceImpl.java index c5e12301c..1549e447b 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxScoreRulesServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxScoreRulesServiceImpl.java @@ -52,32 +52,58 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { wxScoreRulesMapper.deleteByPrimaryKey(id); } + @Override - public int addScoreByType(String tenantId, int type, Long cUserId) { - int addScoreNumber=0; + public int loginAddScore(String tenantId, Long cUserId) { + int addScoreNumber = 0; WxScoreRules scoreRules = new WxScoreRules(); scoreRules.setTenantId(tenantId); List list = wxScoreRulesMapper.findList(scoreRules); - if(list.isEmpty()){ + if (list.isEmpty()) { return addScoreNumber; } scoreRules = list.get(0); + addScoreNumber = scoreRules.getLoginScoreNumber(); + WxCUser wxCUser = wxCUserService.getById(cUserId); + wxCUser.setScore(wxCUser.getScore() + addScoreNumber); + wxCUserService.saveOrUpdate(wxCUser); + + //修改basic表积分 + if (wxCUser.getPhone() != null) { + //修改basic表积分 + WxCUserBasicInfo wxCUserBasicInfo = new WxCUserBasicInfo(); + wxCUserBasicInfo.setTenantId(tenantId); + wxCUserBasicInfo.setPhone(wxCUser.getPhone()); + wxCUserBasicInfo.setPoins(wxCUser.getScore()); + wxCUserBasicInfo.setCUserId(wxCUser.getId()); + wxCUserBasicInfoService.updateScore(wxCUserBasicInfo); + } + return addScoreNumber; + } - if(type==1){ - //login处理 - addScoreNumber = scoreRules.getLoginScoreNumber(); + @Override + public int payAddScore(String tenantId, Long cUserId,int payPrice) { + if(payPrice==0){ + return 0; } - if(type==2){ - //消费 - addScoreNumber = scoreRules.getConsumptionScoreNumber(); + int addScoreNumber = 0; + WxScoreRules scoreRules = new WxScoreRules(); + scoreRules.setTenantId(tenantId); + List list = wxScoreRulesMapper.findList(scoreRules); + if (list.isEmpty()) { + return 0; } + scoreRules = list.get(0); + int priceCondition = scoreRules.getConsumptionAmount(); + int baseScore = scoreRules.getConsumptionScoreNumber();//消费增长积分 + + addScoreNumber = (payPrice/priceCondition)*baseScore; WxCUser wxCUser = wxCUserService.getById(cUserId); - wxCUser.setScore(wxCUser.getScore()+addScoreNumber); + wxCUser.setScore(wxCUser.getScore() + addScoreNumber); wxCUserService.saveOrUpdate(wxCUser); - //修改basic表积分 - if(wxCUser.getPhone()!=null){ + if (wxCUser.getPhone() != null) { //修改basic表积分 WxCUserBasicInfo wxCUserBasicInfo = new WxCUserBasicInfo(); wxCUserBasicInfo.setTenantId(tenantId); From 54f1e762502ebb8db8201bb6f7bebe26bff6120d Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 25 Aug 2018 15:14:10 +0800 Subject: [PATCH 49/58] =?UTF-8?q?[webPV][=E6=96=B0=E5=A2=9E]:PV=20?= =?UTF-8?q?=E8=AE=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/simple/service/impl/WxAdminLogServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxAdminLogServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxAdminLogServiceImpl.java index 0eaa59a0b..75017d805 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxAdminLogServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxAdminLogServiceImpl.java @@ -56,7 +56,7 @@ public class WxAdminLogServiceImpl implements WxAdminLogService { if (logList.size() > 0) { WxAdminLog log = logList.get(0); log.setCount(log.getCount() + 1); - wxAdminLogMapper.updateByPrimaryKeySelective(record); + wxAdminLogMapper.updateByPrimaryKeySelective(log); } else { final IdWorker idWorker = IdWorker.get(); reqQ.setId(idWorker.nextId()); From dd669c02a1796a809e854b9aa6624ae940387844 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sat, 25 Aug 2018 15:39:31 +0800 Subject: [PATCH 50/58] =?UTF-8?q?[=E6=A0=87=E7=AD=BE=E7=9F=AD=E4=BF=A1][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E8=A7=A3=E6=9E=90=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E4=BA=BA=E7=BE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/service/impl/WxMsgServiceImpl.java | 33 +++++++++++++++++-- 1 file changed, 30 insertions(+), 3 deletions(-) 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 8144d1a23..9676435c4 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMsgServiceImpl.java @@ -6,8 +6,11 @@ import com.github.pagehelper.PageInfo; import com.simple.common.IdWorker; import com.simple.common.Result; import com.simple.common.ResultData; +import com.simple.domain.po.WxCUser; import com.simple.domain.po.WxMsg; import com.simple.domain.po.WxMsgConfig; +import com.simple.mapper.WxCUserMapper; +import com.simple.mapper.WxCUserTagsMapper; import com.simple.mapper.WxMsgConfigMapper; import com.simple.mapper.WxMsgMapper; import com.simple.service.WxMsgService; @@ -29,6 +32,12 @@ public class WxMsgServiceImpl implements WxMsgService { @Autowired WxMsgConfigMapper wxMsgConfigMapper; + @Autowired + WxCUserTagsMapper wxCUserTagsMapper; + + @Autowired + WxCUserMapper wxCUserMapper; + @Override public PageInfo listAsPage(WxMsg record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMsgMapper.findList(record)); @@ -55,7 +64,7 @@ public class WxMsgServiceImpl implements WxMsgService { } if(phones.equals("")){ - return new ResultData(Result.SUCCESS, "您需要添 加要发送的手机号"); + return new ResultData(Result.SUCCESS, "您需要添加要发送的手机号"); } if (wxMsg.getId() == null) { @@ -108,8 +117,26 @@ public class WxMsgServiceImpl implements WxMsgService { } private String parselabel(String label) { - - return null; + String[] arys = label.split(","); + List tagids = new ArrayList<>(); + for (int i = 0; i < arys.length; i++) { + tagids.add(Long.parseLong(arys[i])); + } + List userIds = wxCUserTagsMapper.findUserByTag(tagids); + if(userIds.size()==0) { + return ""; + } + WxCUser wxCUser = new WxCUser(); + wxCUser.setIds(userIds); + List list = wxCUserMapper.findList(wxCUser); + StringBuilder sb=new StringBuilder(); + if(list.size()>0){ + for(WxCUser cuser:list){ + sb.append(cuser.getPhone()).append(","); + } + return sb.toString(); + } + return ""; } private String parseexcle(String excelpath) { From c5ff8071e2aae347c04b98e9ba3e711d6246d3ab Mon Sep 17 00:00:00 2001 From: hupeng Date: Sat, 25 Aug 2018 15:54:30 +0800 Subject: [PATCH 51/58] =?UTF-8?q?[C=E7=AB=AF][=E6=B7=BB=E5=8A=A0]:?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0C=E7=AB=AF=E5=88=B8=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=92=8C=E8=AF=A6=E6=83=85=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/controller/WxCouponController.java | 1 - .../simple/controller/WxCouponController.java | 20 +- .../com/simple/domain/vo/CouponListReq.java | 45 -- .../com/simple/domain/vo/WxCouponCVo.java | 495 ++++++++++++++++++ .../com/simple/mapper/WxCouponMapper.java | 9 +- .../com/simple/service/WxCouponService.java | 12 +- .../service/impl/WxCouponServiceImpl.java | 10 +- .../main/resources/mapper/WxCouponMapper.xml | 99 +++- 8 files changed, 628 insertions(+), 63 deletions(-) delete mode 100644 mallinkService/src/main/java/com/simple/domain/vo/CouponListReq.java create mode 100644 mallinkService/src/main/java/com/simple/domain/vo/WxCouponCVo.java diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxCouponController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCouponController.java index 702f732af..eb28665e8 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxCouponController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxCouponController.java @@ -28,5 +28,4 @@ public class WxCouponController extends BaseController { return new ResultData(Result.SUCCESS, "查询成功", wxCouponService.getById(id)); } - } diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCouponController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCouponController.java index f51961810..e919c5fea 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxCouponController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCouponController.java @@ -1,5 +1,7 @@ package com.simple.controller; +import com.simple.common.ErrorCode; +import com.simple.domain.vo.WxCouponCVo; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.Assert; @@ -31,8 +33,22 @@ public class WxCouponController extends BaseController { public ResultData list(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { if (null == wxCoupon) wxCoupon = new WxCoupon(); wxCoupon.setTenantId(getTenantId()); - final PageInfo page = wxCouponService.listAsPage(wxCoupon, pageNum, pageSize); - return new ResultData(page); + return new ResultData(wxCouponService.findListForCUser(wxCoupon, pageNum, pageSize)); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/detail") + @ApiImplicitParam(name = "couponId", value = "id", dataType = "String", paramType = "query", required = true) + public ResultData detail(String couponId) { + WxCoupon wxCoupon = new WxCoupon(); + wxCoupon.setTenantId(getTenantId()); + wxCoupon.setId(Long.valueOf(couponId)); + WxCouponCVo wxCouponCVo = wxCouponService.selectDetailForCUser(wxCoupon); + if (wxCouponCVo == null) + return new ResultData(ErrorCode.COUPON_IS_EMPTY); + + return new ResultData(wxCouponCVo); + } @ApiOperation("根据id查询接口") diff --git a/mallinkService/src/main/java/com/simple/domain/vo/CouponListReq.java b/mallinkService/src/main/java/com/simple/domain/vo/CouponListReq.java deleted file mode 100644 index 9a9157033..000000000 --- a/mallinkService/src/main/java/com/simple/domain/vo/CouponListReq.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.simple.domain.vo; - -import java.io.Serializable; - -public class CouponListReq 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="couponId") - private Long couponId; - /*商户ID**/ - @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") - private Long merchantId; - /*业态**/ - @io.swagger.annotations.ApiModelProperty(value="业态",name="businessId") - private Long businessId; - - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - public Long getCouponId() { - return couponId; - } - public void setCouponId(Long _couponId) { - couponId = _couponId; - } - public Long getMerchantId() { - return merchantId; - } - public void setMerchantId(Long _merchantId) { - merchantId = _merchantId; - } - public Long getBusinessId() { - return businessId; - } - public void setBusinessId(Long businessId) { - this.businessId = businessId; - } -} diff --git a/mallinkService/src/main/java/com/simple/domain/vo/WxCouponCVo.java b/mallinkService/src/main/java/com/simple/domain/vo/WxCouponCVo.java new file mode 100644 index 000000000..171f726ad --- /dev/null +++ b/mallinkService/src/main/java/com/simple/domain/vo/WxCouponCVo.java @@ -0,0 +1,495 @@ +package com.simple.domain.vo; + +import com.simple.domain.po.WxCoupon; + +import javax.persistence.Id; +import javax.persistence.Transient; +import java.io.Serializable; +import java.text.DecimalFormat; +import java.util.Date; +import java.util.List; + +public class WxCouponCVo implements Serializable { + private static final long serialVersionUID = 1L; + + @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; + } + + + @Transient + private String salePriceStr; + + @Transient + private String usePriceStr; + + @Transient + private String priceStr; + + /*租户ID**/ + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + private String tenantId; + /*商户id**/ + @io.swagger.annotations.ApiModelProperty(value="商户id",name="merchantId") + private Long merchantId; + /*券类型(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="useLimitQuantity") + private Integer useLimitQuantity; + /*投放频道位置(1.banner图,2.限时抢购)**/ + @io.swagger.annotations.ApiModelProperty(value="投放频道位置(1.banner图,2.限时抢购)",name="targetAd") + private Integer targetAd; + /*1.主动领取2.定向投放**/ + @io.swagger.annotations.ApiModelProperty(value="1.主动领取2.定向投放",name="sendType") + private Integer sendType; + /*发放开始时间**/ + @io.swagger.annotations.ApiModelProperty(value="发放开始时间",name="sendStartDate") + private Date sendStartDate; + /*发放结束时间**/ + @io.swagger.annotations.ApiModelProperty(value="发放结束时间",name="sendEndDate") + private Date sendEndDate; + /*有效时间类型1.时间范围(valid_start_date,valid_end_date). 2领取后几日有效(valid_days)**/ + @io.swagger.annotations.ApiModelProperty(value="有效时间类型1.时间范围(valid_start_date,valid_end_date). 2领取后几日有效(valid_days)",name="validType") + private Integer validType; + /*有效日期-开始**/ + @io.swagger.annotations.ApiModelProperty(value="有效日期-开始",name="validStartDate") + private Date validStartDate; + /*有效日期-结束**/ + @io.swagger.annotations.ApiModelProperty(value="有效日期-结束",name="validEndDate") + private Date validEndDate; + /*自领取之日几日有效,(停车券当天有效)**/ + @io.swagger.annotations.ApiModelProperty(value="自领取之日几日有效,(停车券当天有效)",name="validDays") + private Integer validDays; + /*须知**/ + @io.swagger.annotations.ApiModelProperty(value="须知",name="detail") + private String detail; + /*面额**/ + @io.swagger.annotations.ApiModelProperty(value="面额",name="price") + private Integer price; + /*剩余库存**/ + @io.swagger.annotations.ApiModelProperty(value="剩余库存",name="remainInventory") + private Integer remainInventory; + /*总库存**/ + @io.swagger.annotations.ApiModelProperty(value="总库存",name="inventory") + private Integer inventory; + /*购买须知**/ + @io.swagger.annotations.ApiModelProperty(value="购买须知",name="remark") + private String remark; + /*状态(-1:全部,0:草稿/待生效,1:已生效,2:已失效,3:已作废)**/ + @io.swagger.annotations.ApiModelProperty(value="状态(-1:全部,0:草稿/待生效,1:已生效,2:已失效,3:已作废)",name="status") + private Integer status; + /*创建时间**/ + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") + private Date createDate; + /*更新时间**/ + @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") + private Date updateDate; + /*业态**/ + @io.swagger.annotations.ApiModelProperty(value="业态",name="business") + private String business; + + + /*发券商户信息*/ + /*商户图片**/ + @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 String getTenantId() { + return tenantId; + } + public void setTenantId(String _tenantId) { + tenantId = _tenantId; + } + public Long getMerchantId() { + return merchantId; + } + public void setMerchantId(Long _merchantId) { + merchantId = _merchantId; + } + 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 Integer getUseLimitQuantity() { + return useLimitQuantity; + } + public void setUseLimitQuantity(Integer _useLimitQuantity) { + useLimitQuantity = _useLimitQuantity; + } + public Integer getTargetAd() { + return targetAd; + } + public void setTargetAd(Integer _targetAd) { + targetAd = _targetAd; + } + public Integer getSendType() { + return sendType; + } + public void setSendType(Integer _sendType) { + sendType = _sendType; + } + public Date getSendStartDate() { + return sendStartDate; + } + public void setSendStartDate(Date _sendStartDate) { + sendStartDate = _sendStartDate; + } + public Date getSendEndDate() { + return sendEndDate; + } + public void setSendEndDate(Date _sendEndDate) { + sendEndDate = _sendEndDate; + } + public Integer getValidType() { + return validType; + } + public void setValidType(Integer _validType) { + validType = _validType; + } + public Date getValidStartDate() { + return validStartDate; + } + public void setValidStartDate(Date _validStartDate) { + validStartDate = _validStartDate; + } + public Date getValidEndDate() { + return validEndDate; + } + public void setValidEndDate(Date _validEndDate) { + validEndDate = _validEndDate; + } + public Integer getValidDays() { + return validDays; + } + public void setValidDays(Integer _validDays) { + validDays = _validDays; + } + 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 Integer getRemainInventory() { + return remainInventory; + } + public void setRemainInventory(Integer _remainInventory) { + remainInventory = _remainInventory; + } + public Integer getInventory() { + return inventory; + } + public void setInventory(Integer _inventory) { + inventory = _inventory; + } + public String getRemark() { + return remark; + } + public void setRemark(String _remark) { + remark = _remark; + } + public Integer getStatus() { + return status; + } + public void setStatus(Integer _status) { + status = _status; + } + 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 String getBusiness() { + return business; + } + public void setBusiness(String _business) { + business = _business; + } + public String getSalePriceStr() { + if(salePrice!=null) { + DecimalFormat df=new DecimalFormat("0.00"); + salePriceStr = df.format((float)salePrice/100); + } + return salePriceStr; + } + + public void setSalePriceStr(String salePriceStr) { + this.salePriceStr = salePriceStr; + } + + public String getUsePriceStr() { + if(usePrice!=null) { + DecimalFormat df=new DecimalFormat("0.00"); + usePriceStr = df.format((float)usePrice/100); + } + return usePriceStr; + } + + public void setUsePriceStr(String usePriceStr) { + this.usePriceStr = usePriceStr; + } + + public String getPriceStr() { + if(price!=null) { + DecimalFormat df=new DecimalFormat("0.00"); + priceStr = df.format((float)price/100); + } + return priceStr; + } + + public void setPriceStr(String priceStr) { + this.priceStr = priceStr; + } + + + 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") + ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") + ,MerchantId_ASC("`merchantId` ASC"),MerchantId_DESC("`merchantId` DESC") + ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") + ,CoverImg_ASC("`coverImg` ASC"),CoverImg_DESC("`coverImg` DESC") + ,Title_ASC("`title` ASC"),Title_DESC("`title` DESC") + ,SubTitle_ASC("`subTitle` ASC"),SubTitle_DESC("`subTitle` DESC") + ,SalePrice_ASC("`salePrice` ASC"),SalePrice_DESC("`salePrice` DESC") + ,UsePrice_ASC("`usePrice` ASC"),UsePrice_DESC("`usePrice` DESC") + ,UseLimitQuantity_ASC("`useLimitQuantity` ASC"),UseLimitQuantity_DESC("`useLimitQuantity` DESC") + ,TargetAd_ASC("`targetAd` ASC"),TargetAd_DESC("`targetAd` DESC") + ,SendType_ASC("`sendType` ASC"),SendType_DESC("`sendType` DESC") + ,SendStartDate_ASC("`sendStartDate` ASC"),SendStartDate_DESC("`sendStartDate` DESC") + ,SendEndDate_ASC("`sendEndDate` ASC"),SendEndDate_DESC("`sendEndDate` DESC") + ,ValidType_ASC("`validType` ASC"),ValidType_DESC("`validType` DESC") + ,ValidStartDate_ASC("`validStartDate` ASC"),ValidStartDate_DESC("`validStartDate` DESC") + ,ValidEndDate_ASC("`validEndDate` ASC"),ValidEndDate_DESC("`validEndDate` DESC") + ,ValidDays_ASC("`validDays` ASC"),ValidDays_DESC("`validDays` DESC") + ,Detail_ASC("`detail` ASC"),Detail_DESC("`detail` DESC") + ,Price_ASC("`price` ASC"),Price_DESC("`price` DESC") + ,RemainInventory_ASC("`remainInventory` ASC"),RemainInventory_DESC("`remainInventory` DESC") + ,Inventory_ASC("`inventory` ASC"),Inventory_DESC("`inventory` DESC") + ,Remark_ASC("`remark` ASC"),Remark_DESC("`remark` DESC") + ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") + ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") + ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC") + ,Business_ASC("`business` ASC"),Business_DESC("`business` 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(WxCoupon.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(","); + List fList = new java.util.ArrayList(); + for (int k = 0; k < cols.length; k++) { + fList.add(WxCoupon.Field.valueOf(cols[k])); + } + this.setSortColumns(fList.toArray(new WxCoupon.Field[fList.size()])); + } else { + this.setSortColumns(WxCoupon.Field.valueOf(sortColumns)); + } + } +} diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCouponMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCouponMapper.java index 55acf79f6..37aadcf8f 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCouponMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCouponMapper.java @@ -2,7 +2,7 @@ package com.simple.mapper; import java.util.*; import com.simple.common.CommonMapper; -import com.simple.domain.vo.CouponListReq; +import com.simple.domain.vo.WxCouponCVo; import org.apache.ibatis.annotations.Param; import com.simple.domain.po.WxCoupon; @@ -12,10 +12,11 @@ public interface WxCouponMapper extends CommonMapper { List findEnableList(WxCoupon wxCoupon); - List findCanSendList(WxCoupon record); + List findCanSendList(WxCoupon wxCoupon); - - + List findListForCUser(WxCoupon wxCoupon); + + WxCouponCVo selectDetailForCUser(WxCoupon wxCoupon); } diff --git a/mallinkService/src/main/java/com/simple/service/WxCouponService.java b/mallinkService/src/main/java/com/simple/service/WxCouponService.java index 48a89ed2a..2ac31e91c 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCouponService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCouponService.java @@ -3,7 +3,7 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; import com.simple.domain.po.WxCoupon; -import com.simple.domain.vo.CouponListReq; +import com.simple.domain.vo.WxCouponCVo; public interface WxCouponService { @@ -59,11 +59,9 @@ public interface WxCouponService { * */ PageInfo findCanSendList(WxCoupon record, Integer pageIndex, Integer pageSize); - - - - - - + PageInfo findListForCUser(WxCoupon record, Integer pageIndex, Integer pageSize); + + WxCouponCVo selectDetailForCUser(WxCoupon record); + } 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 46219828b..440886f96 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponServiceImpl.java @@ -4,7 +4,7 @@ import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.simple.domain.po.WxCoupon; -import com.simple.domain.vo.CouponListReq; +import com.simple.domain.vo.WxCouponCVo; import com.simple.mapper.WxCouponMapper; import com.simple.service.WxCouponService; import org.springframework.beans.factory.annotation.Autowired; @@ -61,5 +61,13 @@ public class WxCouponServiceImpl implements WxCouponService { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponMapper.findCanSendList(record)); } + @Override + public PageInfo findListForCUser(WxCoupon record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponMapper.findListForCUser(record)); + } + @Override + public WxCouponCVo selectDetailForCUser(WxCoupon record) { + return wxCouponMapper.selectDetailForCUser(record); + } } diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 3b4ed7811..d05c4cf0b 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -483,10 +483,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + 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.send_start_date,c.send_end_date,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 + + + + c.id,c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.remain_inventory,c.inventory,c.business, + m.name + + + + + From fc3131a3c08adbe521882e04f3af4c5f79d041d8 Mon Sep 17 00:00:00 2001 From: hupeng Date: Sat, 25 Aug 2018 17:07:03 +0800 Subject: [PATCH 52/58] =?UTF-8?q?[B=E7=AB=AF][=E6=B7=BB=E5=8A=A0]:?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=B8=E8=AF=A6=E6=83=85=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCouponOrderController.java | 15 ++++++++++ .../simple/service/WxCouponOrderService.java | 7 +++++ .../impl/WxCouponOrderServiceImpl.java | 22 +++++++++++++++ .../resources/mapper/WxCouponOrderMapper.xml | 28 +++++++++++++++---- 4 files changed, 67 insertions(+), 5 deletions(-) diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java index 59f1d9e1c..8775eb69e 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java @@ -87,6 +87,21 @@ public class WxCouponOrderController extends BaseController { return wxCouponOrderService.listOnDateAsPage(getUser().getId(), date, null, null, true); } + + @ApiOperation(value = "卡券详情接口") + @GetMapping("detail") + @ApiImplicitParams({ + @ApiImplicitParam(name = "couponOrderId", value = "券ID", dataType = "string", paramType = "query", required = true) + }) + public ResultData detail(String couponOrderId) { + + if(couponOrderId == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + + return new ResultData(wxCouponOrderService.detailBUserVo(getUser().getId(), couponOrderId)); + } + @ApiOperation(value = "核销接口", notes = "{\"couponOrderId\":\"string\"}") @PostMapping("verify") public ResultData verify(@RequestBody Map paramMap) { diff --git a/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java b/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java index d293d3772..10f184b42 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java @@ -88,4 +88,11 @@ public interface WxCouponOrderService { * @param bUserId C端用户 */ ResultData detailCUserVo(Long cUserId, String couponOrderId); + + /** + * B用户查券详情 + * + * @param bUserId B端用户 + */ + ResultData detailBUserVo(Long bUserId, String couponOrderId); } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java index 869aeb26b..721440aab 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java @@ -182,6 +182,28 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { return new ResultData(wxCouponOrderMapper.selectDetailOfCUser(paramMap)); } + @Override + public ResultData detailBUserVo(Long bUserId, String couponOrderId) { + WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectByPrimaryKey(bUserId); + if(wxMerchantBUser == null){ + logger.error("用户不存在:"+ bUserId); + throw new MallinkException(ErrorCode.USER_IS_EMPTY); + } + + WxMerchant wxMerchant = wxMerchantMapper.selectByPrimaryKey(wxMerchantBUser.getMerchantId()); + if (wxMerchant == null) { + logger.error("商户不存在:" + bUserId); + throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND); + } + + Map paramMap = new HashMap(); + paramMap.put("merchantId", wxMerchant.getId()); + paramMap.put("tenantId", wxMerchant.getTenantId()); + paramMap.put("couponOrderId", couponOrderId); + + return new ResultData(wxCouponOrderMapper.selectDetailOfCUser(paramMap)); + } + @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 0f335fc96..57556b533 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -257,8 +257,16 @@ + select from push_limit + + + + + + + + + From 8d53cdeef8a3717f663a1bb48b2d4af655b4ae2b Mon Sep 17 00:00:00 2001 From: hupeng Date: Sat, 25 Aug 2018 17:38:01 +0800 Subject: [PATCH 54/58] =?UTF-8?q?[C=E7=AB=AF][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E4=BF=AE=E5=A4=8DC=E7=AB=AFbanner=E5=9B=BE=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E4=BD=BF=E7=94=A8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxBannersController.java | 71 ------- .../com/simple/controller/BaseController.java | 6 + .../controller/WxCouponOrderController.java | 2 + .../com/simple/controller/BaseController.java | 7 + .../controller/WxBannersController.java | 71 ------- .../controller/WxCampaignController.java | 2 +- .../java/com/simple/domain/po/WxBanners.java | 191 ------------------ .../com/simple/mapper/WxBannersMapper.java | 17 -- .../com/simple/service/WxBannersService.java | 48 ----- .../service/impl/WxBannersServiceImpl.java | 54 ----- .../impl/WxCouponOrderServiceImpl.java | 6 +- .../main/resources/mapper/WxBannersMapper.xml | 92 --------- 12 files changed, 20 insertions(+), 547 deletions(-) delete mode 100644 mallinkAdmin/src/main/java/com/simple/controller/WxBannersController.java delete mode 100644 mallinkCApi/src/main/java/com/simple/controller/WxBannersController.java delete mode 100644 mallinkService/src/main/java/com/simple/domain/po/WxBanners.java delete mode 100644 mallinkService/src/main/java/com/simple/mapper/WxBannersMapper.java delete mode 100644 mallinkService/src/main/java/com/simple/service/WxBannersService.java delete mode 100644 mallinkService/src/main/java/com/simple/service/impl/WxBannersServiceImpl.java delete mode 100644 mallinkService/src/main/resources/mapper/WxBannersMapper.xml diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxBannersController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxBannersController.java deleted file mode 100644 index e148e2402..000000000 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxBannersController.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.simple.controller; - -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.WxBanners; -import com.simple.service.WxBannersService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxBanners") -public class WxBannersController extends BaseController -{ - @Autowired - private WxBannersService wxBannersService; - - private Logger logger = Logger.getLogger(WxBannersController.class); - - @ApiOperation("分页列表接口") - @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxBanners wxBanners,Integer pageNum, Integer pageSize) { - if (null == wxBanners) wxBanners = new WxBanners(); - final PageInfo page = wxBannersService.listAsPage(wxBanners, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxBanners wxBanners) { - //Assert.notNull(wxBanners.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxBannersService.saveOrUpdate(wxBanners); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxBanners wxBanners) { - wxBannersService.saveOrUpdate(wxBanners); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData delete(Long id) { - wxBannersService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxBannersService.getById(id)); - } - - - -} diff --git a/mallinkBApi/src/main/java/com/simple/controller/BaseController.java b/mallinkBApi/src/main/java/com/simple/controller/BaseController.java index 3120c1fa3..ba4d3c161 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/BaseController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/BaseController.java @@ -8,9 +8,11 @@ import java.util.Date; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl; import cn.binarywang.wx.miniapp.config.WxMaInMemoryConfig; +import com.simple.common.ErrorCode; import com.simple.domain.po.WxAppinfo; import com.simple.domain.po.WxCUser; import com.simple.domain.po.WxMerchantBUser; +import com.simple.exception.MallinkException; import com.simple.interceptor.AuthorizationInterceptor; import com.simple.service.WxAppinfoService; import com.simple.service.WxCUserService; @@ -59,6 +61,8 @@ public class BaseController { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); Long cUserId = (Long) request.getAttribute(AuthorizationInterceptor.LOGIN_USER_KEY); WxMerchantBUser user = wxMerchantBUserService.getById(cUserId); + if (user == null) + throw new MallinkException(ErrorCode.USER_IS_EMPTY); return user; } @@ -66,6 +70,8 @@ public class BaseController { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); Long cUserId = (Long) request.getAttribute(AuthorizationInterceptor.LOGIN_USER_KEY); WxMerchantBUser user = wxMerchantBUserService.getById(cUserId); + if (user == null) + throw new MallinkException(ErrorCode.USER_IS_EMPTY); return user.getTenantId(); } diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java index 8775eb69e..80ab73d71 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java @@ -99,6 +99,8 @@ public class WxCouponOrderController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } + + return new ResultData(wxCouponOrderService.detailBUserVo(getUser().getId(), couponOrderId)); } diff --git a/mallinkCApi/src/main/java/com/simple/controller/BaseController.java b/mallinkCApi/src/main/java/com/simple/controller/BaseController.java index 144efe018..493bc6f2a 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/BaseController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/BaseController.java @@ -9,8 +9,10 @@ import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl; import cn.binarywang.wx.miniapp.config.WxMaInMemoryConfig; import com.simple.annotation.AuthIgnore; +import com.simple.common.ErrorCode; import com.simple.domain.po.WxAppinfo; import com.simple.domain.po.WxCUser; +import com.simple.exception.MallinkException; import com.simple.interceptor.AuthorizationInterceptor; import com.simple.service.WxAppinfoService; import com.simple.service.WxCUserService; @@ -57,6 +59,8 @@ public class BaseController { HttpServletRequest request = ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest(); Long cUserId = (Long)request.getAttribute(AuthorizationInterceptor.LOGIN_USER_KEY); WxCUser user = wxCUserService.getById(cUserId); + if (user == null) + throw new MallinkException(ErrorCode.USER_IS_EMPTY); return user; } @@ -70,10 +74,13 @@ public class BaseController { HttpServletRequest request = ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest(); Long cUserId = (Long)request.getAttribute(AuthorizationInterceptor.LOGIN_USER_KEY); WxCUser user = wxCUserService.getById(cUserId); + if (user == null) + throw new MallinkException(ErrorCode.USER_IS_EMPTY); return user.getTenantId(); } public WxAppinfo getAppInfo(String appId) { + return wxAppinfoService.getByAppId(appId); } diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxBannersController.java b/mallinkCApi/src/main/java/com/simple/controller/WxBannersController.java deleted file mode 100644 index e148e2402..000000000 --- a/mallinkCApi/src/main/java/com/simple/controller/WxBannersController.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.simple.controller; - -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.WxBanners; -import com.simple.service.WxBannersService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxBanners") -public class WxBannersController extends BaseController -{ - @Autowired - private WxBannersService wxBannersService; - - private Logger logger = Logger.getLogger(WxBannersController.class); - - @ApiOperation("分页列表接口") - @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxBanners wxBanners,Integer pageNum, Integer pageSize) { - if (null == wxBanners) wxBanners = new WxBanners(); - final PageInfo page = wxBannersService.listAsPage(wxBanners, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxBanners wxBanners) { - //Assert.notNull(wxBanners.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxBannersService.saveOrUpdate(wxBanners); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxBanners wxBanners) { - wxBannersService.saveOrUpdate(wxBanners); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData delete(Long id) { - wxBannersService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxBannersService.getById(id)); - } - - - -} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCampaignController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCampaignController.java index b914ec35c..856480e09 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxCampaignController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCampaignController.java @@ -23,7 +23,7 @@ import java.util.List; import static com.simple.domain.po.WxCampaign.Field.SortNum_ASC; @RestController -@RequestMapping("wxCampaign") +@RequestMapping("/api/wxCampaign") @Api(description="促销和banner接口") public class WxCampaignController extends BaseController { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxBanners.java b/mallinkService/src/main/java/com/simple/domain/po/WxBanners.java deleted file mode 100644 index 167885015..000000000 --- a/mallinkService/src/main/java/com/simple/domain/po/WxBanners.java +++ /dev/null @@ -1,191 +0,0 @@ -package com.simple.domain.po; - -import javax.persistence.*; -import java.util.*; -import java.math.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; -import java.io.Serializable; - -@Table(name = "wx_banners") -public class WxBanners implements Serializable { - private static final long serialVersionUID = 1L; - - @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; - } - - - - /*租户ID**/ - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; - /*封面图**/ - @io.swagger.annotations.ApiModelProperty(value="封面图",name="facePicUrl") - private String facePicUrl; - /*活动类型 1h5页面2视频**/ - @io.swagger.annotations.ApiModelProperty(value="活动类型 1h5页面2视频",name="activityType") - private Integer activityType; - /*链接**/ - @io.swagger.annotations.ApiModelProperty(value="链接",name="url") - private String url; - /*排序**/ - @io.swagger.annotations.ApiModelProperty(value="排序",name="sortNum") - private Integer sortNum; - /*创建时间**/ - @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") - private Date createtime; - /*上线时间**/ - @io.swagger.annotations.ApiModelProperty(value="上线时间",name="uptime") - private Date uptime; - /*说明**/ - @io.swagger.annotations.ApiModelProperty(value="说明",name="desc") - private String desc; - /*状态 1启用 2停用**/ - @io.swagger.annotations.ApiModelProperty(value="状态 1启用 2停用",name="isEnable") - private Integer isEnable; - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - public String getFacePicUrl() { - return facePicUrl; - } - public void setFacePicUrl(String _facePicUrl) { - facePicUrl = _facePicUrl; - } - public Integer getActivityType() { - return activityType; - } - public void setActivityType(Integer _activityType) { - activityType = _activityType; - } - public String getUrl() { - return url; - } - public void setUrl(String _url) { - url = _url; - } - public Integer getSortNum() { - return sortNum; - } - public void setSortNum(Integer _sortNum) { - sortNum = _sortNum; - } - public Date getCreatetime() { - return createtime; - } - public void setCreatetime(Date _createtime) { - createtime = _createtime; - } - public Date getUptime() { - return uptime; - } - public void setUptime(Date _uptime) { - uptime = _uptime; - } - public String getDesc() { - return desc; - } - public void setDesc(String _desc) { - desc = _desc; - } - public Integer getIsEnable() { - return isEnable; - } - public void setIsEnable(Integer _isEnable) { - isEnable = _isEnable; - } - - - - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") - ,FacePicUrl_ASC("`facePicUrl` ASC"),FacePicUrl_DESC("`facePicUrl` DESC") - ,ActivityType_ASC("`activityType` ASC"),ActivityType_DESC("`activityType` DESC") - ,Url_ASC("`url` ASC"),Url_DESC("`url` DESC") - ,SortNum_ASC("`sortNum` ASC"),SortNum_DESC("`sortNum` DESC") - ,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` DESC") - ,Uptime_ASC("`uptime` ASC"),Uptime_DESC("`uptime` DESC") - ,Desc_ASC("`desc` ASC"),Desc_DESC("`desc` DESC") - ,IsEnable_ASC("`isEnable` ASC"),IsEnable_DESC("`isEnable` 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(WxBanners.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(Field.valueOf(cols[k])); - } - this.setSortColumns(fList.toArray(new Field[fList.size()])); - } else { - this.setSortColumns(Field.valueOf(sortColumns)); - } - } -} diff --git a/mallinkService/src/main/java/com/simple/mapper/WxBannersMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxBannersMapper.java deleted file mode 100644 index f100713bf..000000000 --- a/mallinkService/src/main/java/com/simple/mapper/WxBannersMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.simple.mapper; - -import java.util.*; -import com.simple.common.CommonMapper; -import org.apache.ibatis.annotations.Param; -import com.simple.domain.po.WxBanners; - -public interface WxBannersMapper extends CommonMapper { - - List findList(WxBanners wxBanners); - - - - - - -} diff --git a/mallinkService/src/main/java/com/simple/service/WxBannersService.java b/mallinkService/src/main/java/com/simple/service/WxBannersService.java deleted file mode 100644 index 63a7ffa9e..000000000 --- a/mallinkService/src/main/java/com/simple/service/WxBannersService.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.simple.service; - -import java.util.*; -import com.github.pagehelper.PageInfo; -import com.simple.domain.po.WxBanners; - -public interface WxBannersService { - - /** - * 根据实体查询分页列表 - * - * @param record - * @param offset - * @param limit - * @return - */ - PageInfo listAsPage(WxBanners record, Integer pageIndex, Integer pageSize); - - /** - * 根据Id获得实体 - * - * @param id - * @return - */ - WxBanners getById(Long id); - - /** - * 保存或更新实体 - * - * @param record - */ - void saveOrUpdate(WxBanners record); - - /** - * 根据Id删除实体 - * - * @param id - */ - void deleteById(Long id); - - - - - - - - -} diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxBannersServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxBannersServiceImpl.java deleted file mode 100644 index 9c5e4b508..000000000 --- a/mallinkService/src/main/java/com/simple/service/impl/WxBannersServiceImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.simple.service.impl; - -import java.util.*; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.simple.domain.po.WxBanners; -import com.simple.mapper.WxBannersMapper; -import com.simple.service.WxBannersService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.simple.common.IdWorker; - -@Service -public class WxBannersServiceImpl implements WxBannersService { - - @Autowired - WxBannersMapper wxBannersMapper; - - - @Override - public PageInfo listAsPage(WxBanners record, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxBannersMapper.findList(record)); - } - - @Override - public WxBanners getById(Long id) { - return wxBannersMapper.selectByPrimaryKey(id); - } - - @Override - public void saveOrUpdate(WxBanners record) { - if (record.getId() == null) { - //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - final IdWorker idWorker = IdWorker.get(); - record.setId(idWorker.nextId()); - wxBannersMapper.insertSelective(record); - } else { - wxBannersMapper.updateByPrimaryKeySelective(record); - } - } - - @Override - public void deleteById(Long id) { - wxBannersMapper.deleteByPrimaryKey(id); - } - - - - - - - - -} diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java index 721440aab..d119ce191 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java @@ -200,8 +200,10 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { paramMap.put("merchantId", wxMerchant.getId()); paramMap.put("tenantId", wxMerchant.getTenantId()); paramMap.put("couponOrderId", couponOrderId); - - return new ResultData(wxCouponOrderMapper.selectDetailOfCUser(paramMap)); + WxCouponOrderCVo wxCouponOrderCVo = wxCouponOrderMapper.selectDetailOfCUser(paramMap); + if (wxCouponOrderCVo == null) + return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); + return new ResultData(wxCouponOrderCVo); } diff --git a/mallinkService/src/main/resources/mapper/WxBannersMapper.xml b/mallinkService/src/main/resources/mapper/WxBannersMapper.xml deleted file mode 100644 index 3cf62ab74..000000000 --- a/mallinkService/src/main/resources/mapper/WxBannersMapper.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - `id`,`tenant_id`,`face_pic_url`,`activity_type`,`url`,`sort_num`,`createtime`,`uptime`,`desc`,`is_enable` - - - - where 1 = 1 - - - and `id` = #{id} - - - - - and `tenant_id` like concat('%', #{tenantId},'%') - - - - - and `face_pic_url` like concat('%', #{facePicUrl},'%') - - - - - and `activity_type` = #{activityType} - - - - - and `url` like concat('%', #{url},'%') - - - - - and `sort_num` = #{sortNum} - - - - - and `createtime` = #{createtime} - - - - - and `uptime` = #{uptime} - - - - - and `desc` like concat('%', #{desc},'%') - - - - - and `is_enable` = #{isEnable} - - - - and id in - - #{idItem} - - - order by ${sortColumns} - - - - - - - - - - From 59a5c29e7cd9ec6382a74af672ab4bca1f24a3e3 Mon Sep 17 00:00:00 2001 From: hupeng Date: Sat, 25 Aug 2018 18:10:43 +0800 Subject: [PATCH 55/58] =?UTF-8?q?[B=E7=AB=AF][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=B8=E6=89=BE=E4=B8=8D=E5=88=B0=E5=90=8E?= =?UTF-8?q?=E6=B2=A1=E8=BF=94=E5=9B=9E=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/simple/controller/WxCouponOrderController.java | 5 +---- .../java/com/simple/controller/WxCouponOrderController.java | 2 +- .../com/simple/service/impl/WxCouponOrderServiceImpl.java | 5 ++++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java index 80ab73d71..3b0ea89ee 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java @@ -98,10 +98,7 @@ public class WxCouponOrderController extends BaseController { if(couponOrderId == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } - - - - return new ResultData(wxCouponOrderService.detailBUserVo(getUser().getId(), couponOrderId)); + return wxCouponOrderService.detailBUserVo(getUser().getId(), couponOrderId); } @ApiOperation(value = "核销接口", notes = "{\"couponOrderId\":\"string\"}") diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCouponOrderController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCouponOrderController.java index 7ba6678f0..b2aa9231c 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxCouponOrderController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCouponOrderController.java @@ -83,6 +83,6 @@ public class WxCouponOrderController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } - return new ResultData(wxCouponOrderService.detailCUserVo(getUser().getId(), couponOrderId)); + return wxCouponOrderService.detailCUserVo(getUser().getId(), couponOrderId); } } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java index d119ce191..b96a18597 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java @@ -179,7 +179,10 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { paramMap.put("tenantId", wxCuser.getTenantId()); paramMap.put("couponOrderId", couponOrderId); - return new ResultData(wxCouponOrderMapper.selectDetailOfCUser(paramMap)); + WxCouponOrderCVo wxCouponOrderCVo = wxCouponOrderMapper.selectDetailOfCUser(paramMap); + if (wxCouponOrderCVo == null) + return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); + return new ResultData(wxCouponOrderCVo); } @Override From 6b0d85ddceacc0facdf8cacaa2cd32ea037f04c6 Mon Sep 17 00:00:00 2001 From: hupeng Date: Sat, 25 Aug 2018 21:09:48 +0800 Subject: [PATCH 56/58] =?UTF-8?q?[C=E7=AB=AF][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E4=BF=AE=E5=A4=8Dc=E7=AB=AFchannel=E6=B2=A1=E6=9C=89=E9=9D=A2?= =?UTF-8?q?=E9=A2=9D=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/domain/vo/WxCouponChannelVo.java | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/mallinkService/src/main/java/com/simple/domain/vo/WxCouponChannelVo.java b/mallinkService/src/main/java/com/simple/domain/vo/WxCouponChannelVo.java index dca0477df..71891741f 100644 --- a/mallinkService/src/main/java/com/simple/domain/vo/WxCouponChannelVo.java +++ b/mallinkService/src/main/java/com/simple/domain/vo/WxCouponChannelVo.java @@ -27,6 +27,10 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable { /*使用条件金额(适用于类型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; + @Transient private String salePriceStr; @@ -34,6 +38,9 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable { @Transient private String usePriceStr; + @Transient + private String priceStr; + /*限领张数**/ @io.swagger.annotations.ApiModelProperty(value="限领张数",name="useLimitQuantity") private Integer useLimitQuantity; @@ -88,6 +95,14 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable { this.usePrice = usePrice; } + public void setPrice(Integer price) { + this.price = price; + } + + public Integer getPrice() { + return price; + } + public Integer getUseLimitQuantity() { return useLimitQuantity; } @@ -144,10 +159,24 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable { this.usePriceStr = usePriceStr; } + + public String getPriceStr() { + if(price!=null) { + DecimalFormat df=new DecimalFormat("0.00"); + priceStr = df.format((float)price/100); + } + return priceStr; + } + + public void setPriceStr(String priceStr) { + this.priceStr = priceStr; + } + public WxCouponChannelVo(){} public WxCouponChannelVo setWxCoupon (WxCoupon wxCoupon){ this.coverImg=wxCoupon.getCoverImg(); this.remainInventory=wxCoupon.getRemainInventory(); + this.price=wxCoupon.getPrice(); this.salePrice=wxCoupon.getSalePrice(); this.sendStartDate=wxCoupon.getSendStartDate(); this.sendEndDate=wxCoupon.getSendEndDate(); From 9b5aa00b8ea99a0a7c790388e3f8662c9a70de61 Mon Sep 17 00:00:00 2001 From: "jinguo24@163.com" Date: Sat, 25 Aug 2018 22:37:09 +0800 Subject: [PATCH 57/58] =?UTF-8?q?[=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]=E8=8E=B7=E5=8F=96=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/simple/controller/HomeController.java | 47 +++++++++++++------ .../controller/MallUserInfoController.java | 10 ++-- .../com/simple/domain/po/MallUserInfo.java | 10 ++++ 3 files changed, 47 insertions(+), 20 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java b/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java index d0f406ae5..121052a49 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/HomeController.java @@ -1,12 +1,8 @@ package com.simple.controller; -import java.util.List; -import java.util.stream.Collectors; - import org.apache.shiro.SecurityUtils; import org.apache.shiro.authc.UsernamePasswordToken; import org.apache.shiro.subject.Subject; -import org.omg.CORBA.SystemException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.GetMapping; @@ -14,14 +10,13 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import com.simple.common.ErrorCode; -import com.simple.common.Result; +import com.github.pagehelper.PageInfo; import com.simple.common.ResultData; -import com.simple.domain.po.MallPermission; -import com.simple.domain.po.MallRole; +import com.simple.domain.po.MallRolePermission; import com.simple.domain.po.MallUserInfo; -import com.simple.service.MallPermissionService; -import com.simple.service.MallRoleService; +import com.simple.domain.po.MallUserRole; +import com.simple.service.MallRolePermissionService; +import com.simple.service.MallUserRoleService; import com.simple.shiro.UserSession; import io.swagger.annotations.Api; @@ -32,11 +27,17 @@ import io.swagger.annotations.ApiOperation; @Api(description="登录相关接口") public class HomeController { +// @Autowired +// private MallRoleService sysRoleService; +// +// @Autowired +// private MallPermissionService sysPermissionService; + @Autowired - private MallRoleService sysRoleService; - + private MallUserRoleService mallUserRoleService; + @Autowired - private MallPermissionService sysPermissionService; + private MallRolePermissionService mallRolePermissionService; // @GetMapping("login") // public ResultData login() { @@ -64,7 +65,25 @@ public class HomeController { // } MallUserInfo info =(MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); info.setPassword("保密"); - System.out.println("id:"+ SecurityUtils.getSubject().getSession().getId()); +// System.out.println("id:"+ SecurityUtils.getSubject().getSession().getId()); + MallUserRole ur = new MallUserRole(); + ur.setUid(info.getId()); + PageInfo page = mallUserRoleService.listAsPage(ur, 1, 1); + if(page.getSize()>0) { + Long roleId = page.getList().get(0).getRoleId(); + MallRolePermission p = new MallRolePermission(); + p.setRoleId(p.getRoleId()); + p.setTenantId(info.getTenantId()); + PageInfo listAsPage = mallRolePermissionService.listAsPage(p, 1, 100); + String menus = ""; + for(MallRolePermission rp :listAsPage.getList()) { + menus+=rp.getPermissionId()+","; + } + if(menus.length()>0) { + menus = menus.substring(0, menus.length()-1); + } + info.setMenus(menus); + } data.data=info; }catch(Exception e) { return new ResultData(ResultData.ERROR,"用户名或者密码错误"); diff --git a/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java b/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java index 21ca8197d..c8d354e52 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/MallUserInfoController.java @@ -1,14 +1,8 @@ package com.simple.controller; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; -import com.simple.domain.po.MallUserInfo; -import com.simple.domain.po.MallUserRole; -import com.simple.service.MallUserInfoService; -import com.simple.service.MallUserRoleService; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.Assert; @@ -20,6 +14,10 @@ import org.springframework.web.bind.annotation.RestController; import com.github.pagehelper.PageInfo; import com.simple.common.ResultData; +import com.simple.domain.po.MallUserInfo; +import com.simple.domain.po.MallUserRole; +import com.simple.service.MallUserInfoService; +import com.simple.service.MallUserRoleService; import com.simple.shiro.PasswordHelper; import com.simple.shiro.UserSession; 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 318ea159c..3c6a4665b 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/MallUserInfo.java +++ b/mallinkService/src/main/java/com/simple/domain/po/MallUserInfo.java @@ -73,7 +73,17 @@ public class MallUserInfo implements Serializable { //该用户包含的所有权限 @Transient private List permission; + //拥有的菜单权限 + private String menus; + public String getMenus() { + return menus; + } + + public void setMenus(String menus) { + this.menus = menus; + } + public Long getRoleId() { return roleId; } From b593d7e6d7e0d7b3c2b954ae552cdda10d809464 Mon Sep 17 00:00:00 2001 From: "jinguo24@163.com" Date: Sat, 25 Aug 2018 22:57:31 +0800 Subject: [PATCH 58/58] =?UTF-8?q?[=E4=BC=9A=E5=91=98=E7=AE=A1=E7=90=86][?= =?UTF-8?q?=E6=96=B0=E5=A2=9E]=E7=94=A8=E6=88=B7=E6=98=B5=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxCUserBasicInfoController.java | 1 + .../simple/domain/po/WxCUserBasicInfo.java | 24 +++++++++++++++++++ .../mapper/WxCUserBasicInfoMapper.xml | 5 +++- 3 files changed, 29 insertions(+), 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 e53dc6c37..f60ce2cc1 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java @@ -94,6 +94,7 @@ public class WxCUserBasicInfoController extends BaseController wxCUserBasicInfo.setCUserId(wxCUser.getId()); wxCUserBasicInfo.setPhone(wxCUser.getPhone()); wxCUserBasicInfo.setTenantId(wxCUser.getTenantId()); + wxCUserBasicInfo.setNickName(wxCUser.getNickName()); wxCUserBasicInfoService.saveOrUpdate(wxCUserBasicInfo); } diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCUserBasicInfo.java b/mallinkService/src/main/java/com/simple/domain/po/WxCUserBasicInfo.java index 89abc7e02..6b8545109 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCUserBasicInfo.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCUserBasicInfo.java @@ -82,6 +82,14 @@ public class WxCUserBasicInfo implements Serializable { /*用户姓名**/ @io.swagger.annotations.ApiModelProperty(value="用户姓名",name="name") private String name; + + /*会员等级**/ + @io.swagger.annotations.ApiModelProperty(value="会员等级",name="level") + private String level; + /*用户昵称**/ + @io.swagger.annotations.ApiModelProperty(value="用户昵称",name="nickName") + private String nickName; + @Transient private String tagIds; @Transient @@ -89,6 +97,22 @@ public class WxCUserBasicInfo implements Serializable { @Transient private long count; + public String getLevel() { + return level; + } + + public void setLevel(String level) { + this.level = level; + } + + public String getNickName() { + return nickName; + } + + public void setNickName(String nickName) { + this.nickName = nickName; + } + public long getCount() { return count; } diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index d26af8a36..b4315b23b 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -16,10 +16,13 @@ + + - `id`,`phone`,`birthdate`,`education`,`sex`,`email`,`address`,`poins`,`tag_id`,`c_user_id`,`create_date`,`update_date`,`tenant_id`,`name` + `id`,`phone`,`birthdate`,`education`,`sex`,`email`,`address`,`poins`,`tag_id`,`c_user_id`, + `create_date`,`update_date`,`tenant_id`,`name`,level,nickName