From 90176440822a2e94d1245d899df26ab9437b7525 Mon Sep 17 00:00:00 2001 From: hupeng Date: Wed, 19 Feb 2020 14:42:36 +0800 Subject: [PATCH] =?UTF-8?q?yshop1.9.9=E7=89=88=E6=9C=AC,=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=BA=86=E5=85=AC=E4=BC=97=E5=8F=B7=E9=85=8D=E7=BD=AE,?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=96=B0=E5=A2=9E=E8=AE=A2=E5=8D=95=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E6=90=9C=E7=B4=A2=E4=B8=8E=E4=BC=98=E5=8C=96=E4=BA=86?= =?UTF-8?q?=E5=95=86=E5=93=81=E6=98=BE=E7=A4=BA=E7=AD=89,=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D#I19S9R=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/YxStorePinkServiceImpl.java | 7 +++++- .../web/controller/WechatController.java | 7 +++++- .../shop/rest/YxStoreOrderController.java | 22 ++++++++++++++++++- .../shop/service/YxStoreOrderService.java | 2 +- .../dto/YxStoreOrderQueryCriteria.java | 18 +++++++++++++++ .../service/impl/YxStoreOrderServiceImpl.java | 6 +++-- .../wechat/rest/YxSystemConfigController.java | 2 +- 7 files changed, 57 insertions(+), 7 deletions(-) diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java index ec75dfd3..87a816cf 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java @@ -91,6 +91,8 @@ public class YxStorePinkServiceImpl extends BaseServiceImpl map = getPinkMemberAndPinK(pink); List pinkAll = (List)map.get("pinkAll"); YxStorePink pinkT = (YxStorePink)map.get("pinkT"); @@ -103,7 +105,10 @@ public class YxStorePinkServiceImpl extends BaseServiceImpl 0){ + nextPinkT = pinkAll.get(0); + } //先退团长的money RefundParam param = new RefundParam(); diff --git a/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WechatController.java b/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WechatController.java index 54214652..346bd62e 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WechatController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WechatController.java @@ -159,7 +159,12 @@ public class WechatController extends BaseController { String appId = RedisUtil.get("wechat_appid"); if(StrUtil.isBlank(appId)) return "请配置公众号"; - WxMpService wxService = WxMpConfiguration.getWxMpService(appId); + + final WxMpService wxService = WxMpConfiguration.getWxMpService(appId); + if (wxService == null) { + throw new IllegalArgumentException(String.format("未找到对应appid=[%d]的配置，请核实！", appId)); + } + if (wxService.checkSignature(timestamp, nonce, signature)) { return echostr; } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxStoreOrderController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxStoreOrderController.java index 23ea2583..88f5a1a4 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxStoreOrderController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxStoreOrderController.java @@ -83,7 +83,8 @@ public class YxStoreOrderController { @PreAuthorize("@el.check('admin','YXSTOREORDER_ALL','YXSTOREORDER_SELECT')") public ResponseEntity getYxStoreOrders(YxStoreOrderQueryCriteria criteria, Pageable pageable, - @RequestParam(name = "orderStatus") String orderStatus){ + @RequestParam(name = "orderStatus") String orderStatus, + @RequestParam(name = "orderType") String orderType){ if(StrUtil.isNotEmpty(orderStatus)){ @@ -133,6 +134,25 @@ public class YxStoreOrderController { break; } } + if(StrUtil.isNotEmpty(orderType)){ + switch (orderType){ + case "1": + criteria.setBargainId(0); + criteria.setCombinationId(0); + criteria.setSeckillId(0); + break; + case "2": + criteria.setNewCombinationId(0); + break; + case "3": + criteria.setNewSeckillId(0); + break; + case "4": + criteria.setNewBargainId(0); + break; + } + } + return new ResponseEntity(yxStoreOrderService.queryAll(criteria,pageable),HttpStatus.OK); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderService.java index 2328d66d..b48c7fbd 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderService.java @@ -19,7 +19,7 @@ public interface YxStoreOrderService { Map chartCount(); - String orderType(int id, int pinkId, int combinationId, int seckillId); + String orderType(int id, int pinkId, int combinationId, int seckillId,int bargainId); void refund(YxStoreOrder resources); diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderQueryCriteria.java index 4c893c65..1df89d8b 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderQueryCriteria.java @@ -33,4 +33,22 @@ public class YxStoreOrderQueryCriteria{ @Query private Integer isDel; + + @Query + private Integer combinationId; + + @Query + private Integer seckillId; + + @Query + private Integer bargainId; + + @Query(propName="combinationId",type = Query.Type.NOT_EQUAL) + private Integer newCombinationId; + + @Query(propName="seckillId",type = Query.Type.NOT_EQUAL) + private Integer newSeckillId; + + @Query(propName="bargainId",type = Query.Type.NOT_EQUAL) + private Integer newBargainId; } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java index 12e6bb87..dbc19f12 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java @@ -197,7 +197,7 @@ public class YxStoreOrderServiceImpl implements YxStoreOrderService { } @Override - public String orderType(int id,int pinkId, int combinationId,int seckillId) { + public String orderType(int id,int pinkId, int combinationId,int seckillId,int bargainId) { String str = "[普通订单]"; if(pinkId > 0 || combinationId > 0){ YxStorePink storePink = storePinkRepository.findByOrderIdKey(id); @@ -222,6 +222,8 @@ public class YxStoreOrderServiceImpl implements YxStoreOrderService { }else if(seckillId > 0){ str = "[秒杀订单]"; + }else if(bargainId > 0){ + str = "[砍价订单]"; } return str; } @@ -263,7 +265,7 @@ public class YxStoreOrderServiceImpl implements YxStoreOrderService { yxStoreOrderDTO.setPinkName(orderType(yxStoreOrder.getId() ,yxStoreOrder.getPinkId(),yxStoreOrder.getCombinationId() - ,yxStoreOrder.getSeckillId())); + ,yxStoreOrder.getSeckillId(),yxStoreOrder.getBargainId())); List cartInfos = yxStoreOrderCartInfoRepository .findByOid(yxStoreOrder.getId()); diff --git a/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxSystemConfigController.java b/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxSystemConfigController.java index 2df39e48..324a55ce 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxSystemConfigController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxSystemConfigController.java @@ -55,7 +55,7 @@ public class YxSystemConfigController { yxSystemConfigModel.setValue(value.toString()); //重新配置微信相关 if(key.equals("wechat_appid")){ - WxMpConfiguration.removeWxMpService(key); + WxMpConfiguration.removeWxMpService(value.toString()); } RedisUtil.set(key,value.toString(),0); if(ObjectUtil.isNull(yxSystemConfig)){