From 7bfdc8ad76ae772ca774d6c9345ecc873accc8fa Mon Sep 17 00:00:00 2001 From: hupeng Date: Sun, 1 Mar 2020 23:10:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=A7=E5=93=81=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/StoreBargainController.java | 7 ++- .../StoreCombinationController.java | 7 ++- .../service/impl/YxStoreOrderServiceImpl.java | 45 ++++++++++--------- .../modules/security/rest/AuthController.java | 22 ++++----- .../controller/StoreProductController.java | 18 +++++--- .../impl/YxUserExtractServiceImpl.java | 5 ++- .../web/controller/UserBillController.java | 7 ++- .../co/yixiang/constant/ShopConstants.java | 10 +++++ .../java/co/yixiang/enums/OrderInfoEnum.java | 7 ++- .../java/co/yixiang/enums/ProductEnum.java | 23 ++++++++++ 10 files changed, 104 insertions(+), 47 deletions(-) create mode 100644 yshop-common/src/main/java/co/yixiang/enums/ProductEnum.java diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreBargainController.java b/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreBargainController.java index 2cf52a85..e8f8a630 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreBargainController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreBargainController.java @@ -19,6 +19,7 @@ import co.yixiang.annotation.AnonymousAccess; import co.yixiang.aop.log.Log; import co.yixiang.common.api.ApiResult; import co.yixiang.common.web.controller.BaseController; +import co.yixiang.enums.AppFromEnum; import co.yixiang.modules.activity.entity.YxStoreBargainUser; import co.yixiang.modules.activity.entity.YxStoreBargainUserHelp; import co.yixiang.modules.activity.service.YxStoreBargainService; @@ -296,7 +297,9 @@ public class StoreBargainController extends BaseController { YxUserQueryVo userInfo = yxUserService.getYxUserById(uid); String userType = userInfo.getUserType(); - if(!userType.equals("routine")) userType = "H5"; + if(!userType.equals(AppFromEnum.ROUNTINE.getValue())) { + userType = AppFromEnum.H5.getValue(); + } String name = bargainId+"_"+uid + "_"+userType+"_bargain_share_wap.jpg"; YxSystemAttachment attachment = systemAttachmentService.getInfo(name); String fileDir = path+"qrcode"+ File.separator; @@ -305,7 +308,7 @@ public class StoreBargainController extends BaseController { //生成二维码 //判断用户是否小程序,注意小程序二维码生成路径要与H5不一样 不然会导致都跳转到小程序问题 File file = FileUtil.mkdir(new File(fileDir)); - if(userType.equals("routine")){ + if(userType.equals(AppFromEnum.ROUNTINE.getValue())){ siteUrl = siteUrl+"/bargain/"; QrCodeUtil.generate(siteUrl+"?bargainId="+bargainId+"&uid="+uid+"&spread="+uid, 180, 180, FileUtil.file(fileDir+name)); diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreCombinationController.java b/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreCombinationController.java index 52572788..7f00055a 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreCombinationController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreCombinationController.java @@ -18,6 +18,7 @@ import co.yixiang.annotation.AnonymousAccess; import co.yixiang.aop.log.Log; import co.yixiang.common.api.ApiResult; import co.yixiang.common.web.controller.BaseController; +import co.yixiang.enums.AppFromEnum; import co.yixiang.modules.activity.entity.YxStorePink; import co.yixiang.modules.activity.service.YxStoreCombinationService; import co.yixiang.modules.activity.service.YxStorePinkService; @@ -131,7 +132,9 @@ public class StoreCombinationController extends BaseController { int uid = SecurityUtils.getUserId().intValue(); YxUserQueryVo userInfo = yxUserService.getYxUserById(uid); String userType = userInfo.getUserType(); - if(!userType.equals("routine")) userType = "H5"; + if(!userType.equals(AppFromEnum.ROUNTINE.getValue())) { + userType = AppFromEnum.H5.getValue(); + } String name = pinkId+"_"+uid + "_"+userType+"_pink_share_wap.jpg"; YxSystemAttachment attachment = systemAttachmentService.getInfo(name); String fileDir = path+"qrcode"+ File.separator; @@ -140,7 +143,7 @@ public class StoreCombinationController extends BaseController { //生成二维码 //String fileDir = path+"qrcode"+File.separator; File file = FileUtil.mkdir(new File(fileDir)); - if(userType.equals("routine")){ + if(userType.equals(AppFromEnum.ROUNTINE.getValue())){ siteUrl = siteUrl+"/pink/"; QrCodeUtil.generate(siteUrl+"?pinkId="+pinkId+"&spread="+uid, 180, 180, FileUtil.file(fileDir+name)); diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java index b5b712d7..cc8303ba 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java @@ -266,7 +266,10 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq("order_id",orderId); YxStoreOrder storeOrder = new YxStoreOrder(); - storeOrder.setPaid(1); + storeOrder.setPaid(OrderInfoEnum.PAY_STATUS_1.getValue()); storeOrder.setPayType(payType); storeOrder.setPayTime(OrderUtil.getSecondTimestampTwo()); yxStoreOrderMapper.update(storeOrder,wrapper); @@ -1032,7 +1035,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl> moreGoodsList(@PathVariable Integer type){ Map map = new LinkedHashMap<>(); - if(type == 1){//TODO 精品推荐 + if(type.equals(ProductEnum.TYPE_1.getValue())){//TODO 精品推荐 map.put("list",storeProductService.getList(1,20,1)); - }else if(type == 2){//TODO 热门榜单 + }else if(type.equals(ProductEnum.TYPE_2.getValue())){//TODO 热门榜单 map.put("list",storeProductService.getList(1,20,4)); - }else if(type == 3){//TODO 首发新品 + }else if(type.equals(ProductEnum.TYPE_3.getValue())){//TODO 首发新品 map.put("list",storeProductService.getList(1,20,2)); - }else if(type == 4){//TODO 促销单品 + }else if(type.equals(ProductEnum.TYPE_4.getValue())){//TODO 促销单品 map.put("list",storeProductService.getList(1,20,3)); } @@ -134,7 +136,9 @@ public class StoreProductController extends BaseController { YxUserQueryVo userInfo = yxUserService.getYxUserById(uid); String userType = userInfo.getUserType(); - if(!userType.equals("routine")) userType = "H5"; + if(!userType.equals(AppFromEnum.ROUNTINE.getValue())) { + userType = AppFromEnum.H5.getValue(); + } String name = id+"_"+uid + "_"+userType+"_product_detail_wap.jpg"; YxSystemAttachment attachment = systemAttachmentService.getInfo(name); String fileDir = path+"qrcode"+ File.separator; @@ -143,7 +147,7 @@ public class StoreProductController extends BaseController { if(ObjectUtil.isNull(attachment)){ //生成二维码 File file = FileUtil.mkdir(new File(fileDir)); - if(userType.equals("routine")){ + if(userType.equals(AppFromEnum.ROUNTINE.getValue())){ //下载图片 siteUrl = siteUrl+"/product/"; QrCodeUtil.generate(siteUrl+"?productId="+id+"&spread="+uid, 180, 180, @@ -165,7 +169,7 @@ public class StoreProductController extends BaseController { routineQrcodeUrl = apiUrl + "/api/file/" + attachment.getSattDir(); } - if(userType.equals("routine")){ + if(userType.equals(AppFromEnum.ROUNTINE.getValue())){ productDTO.getStoreInfo().setCodeBase(routineQrcodeUrl); }else{ try { diff --git a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserExtractServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserExtractServiceImpl.java index 9d7b8864..0e041a6d 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserExtractServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/user/service/impl/YxUserExtractServiceImpl.java @@ -10,6 +10,7 @@ package co.yixiang.modules.user.service.impl; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; +import co.yixiang.enums.BillEnum; import co.yixiang.exception.ErrorRequestException; import co.yixiang.modules.user.entity.YxUser; import co.yixiang.modules.user.entity.YxUserBill; @@ -127,8 +128,8 @@ public class YxUserExtractServiceImpl extends BaseServiceImpl