diff --git a/admin-pc/.env.development b/admin-pc/.env.development index fcd30f8..6e9a0a3 100644 --- a/admin-pc/.env.development +++ b/admin-pc/.env.development @@ -1,5 +1,6 @@ NODE_ENV=development -VUE_APP_API_BASE_URL=https://admin.momeirenzhubao.com/jewelry-admin/ +//VUE_APP_API_BASE_URL=https://admin.momeirenzhubao.com/jewelry-admin/ +VUE_APP_API_BASE_URL=http://localhost:8001/jewelry-admin/ VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview diff --git a/admin-pc/.env.production b/admin-pc/.env.production index 441a98d..be6a711 100644 --- a/admin-pc/.env.production +++ b/admin-pc/.env.production @@ -1,4 +1,5 @@ NODE_ENV=production -VUE_APP_API_BASE_URL=https://admin.momeirenzhubao.com/jewelry-admin/ +//VUE_APP_API_BASE_URL=https://admin.momeirenzhubao.com/jewelry-admin/ +VUE_APP_API_BASE_URL=http://localhost:8001/jewelry-admin/ VUE_APP_CAS_BASE_URL=http://localhost:8888/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview \ No newline at end of file diff --git a/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java b/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java index 1cff148..0a28c90 100644 --- a/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java +++ b/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java @@ -180,8 +180,8 @@ public class HanHaiMember implements Serializable { @ApiModelProperty(value = "payRole") private java.math.BigDecimal payRole; /**余额*/ - @Excel(name = "余额", width = 15) - @ApiModelProperty(value = "余额") + @Excel(name = "累积佣金", width = 15) + @ApiModelProperty(value = "累积佣金") private java.math.BigDecimal price; /**积分*/ @Excel(name = "积分", width = 15) diff --git a/module-common/src/main/java/org/jeecg/api/bean/FansPageBean.java b/module-common/src/main/java/org/jeecg/api/bean/FansPageBean.java index 112761a..ec4d507 100644 --- a/module-common/src/main/java/org/jeecg/api/bean/FansPageBean.java +++ b/module-common/src/main/java/org/jeecg/api/bean/FansPageBean.java @@ -14,6 +14,8 @@ public class FansPageBean { //用户昵称 private String nickName; + private String phone; + //用户下单量 private Integer orderNum; diff --git a/module-common/src/main/java/org/jeecg/api/bean/WxQrCodeVo.java b/module-common/src/main/java/org/jeecg/api/bean/WxQrCodeVo.java deleted file mode 100644 index e8aff14..0000000 --- a/module-common/src/main/java/org/jeecg/api/bean/WxQrCodeVo.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.jeecg.api.bean; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class WxQrCodeVo { - /**图片地址*/ - @ApiModelProperty(value = "图片地址") - private String url; - - @ApiModelProperty(value = "加油站名称") - private String name; -} diff --git a/module-common/src/main/java/org/jeecg/api/controller/AppletIndexController.java b/module-common/src/main/java/org/jeecg/api/controller/AppletIndexController.java index b9e706f..35e5a2c 100644 --- a/module-common/src/main/java/org/jeecg/api/controller/AppletIndexController.java +++ b/module-common/src/main/java/org/jeecg/api/controller/AppletIndexController.java @@ -43,9 +43,6 @@ public class AppletIndexController { } - - - //获取会员信息 @ApiOperation(value="获取会员信息", notes="获取会员信息") @GetMapping(value = "/getVipInfoList") @@ -54,10 +51,6 @@ public class AppletIndexController { } - - - - //获取二级分类数据接口 @ApiOperation(value="获取二级分类数据接口", notes="获取二级分类数据接口") @GetMapping(value = "/getCategoryPidList") @@ -74,7 +67,6 @@ public class AppletIndexController { } - //获取首页跳转图标 @ApiOperation(value="获取首页跳转图标", notes="获取首页跳转图标") @GetMapping(value = "/getRiceIconList") @@ -127,21 +119,6 @@ public class AppletIndexController { } - - - - - - - - - - - - - - - //加入购物车 传入token shopId num @ApiOperation(value="加入购物车 传入token shopId num", notes="加入购物车 传入token shopId num") @GetMapping(value = "/addCart") @@ -182,8 +159,8 @@ public class AppletIndexController { //创建订单 @ApiOperation(value="创建订单", notes="创建订单") @GetMapping(value = "/createOrder") - public Result createOrder(@RequestHeader("X-Access-Token") String token, String shopId, Integer num,String addressId,Integer payType,String couponId,Integer isGive,Integer memberNum,Integer giveNum) { - return apiRiceService.createOrder(token,shopId,num,addressId,payType,couponId,isGive,memberNum,giveNum); + public Result createOrder(@RequestHeader("X-Access-Token") String token, String shopId, Integer num,String addressId,Integer payType,String couponId,Integer isGive,Integer memberNum,Integer giveNum,String remark) { + return apiRiceService.createOrder(token,shopId,num,addressId,payType,couponId,isGive,memberNum,giveNum,remark); } @@ -207,6 +184,7 @@ public class AppletIndexController { + //商城-加入购物车之后一次下多个订单 - 再次下单 @ApiOperation(value="商城-加入购物车之后一次下多个订单 - 再次下单", notes="商城-加入购物车之后一次下多个订单 - 再次下单") @PostMapping("/createSumOrderAgain") diff --git a/module-common/src/main/java/org/jeecg/api/service/AppletIndexService.java b/module-common/src/main/java/org/jeecg/api/service/AppletIndexService.java index 1f2dc90..9e1b681 100644 --- a/module-common/src/main/java/org/jeecg/api/service/AppletIndexService.java +++ b/module-common/src/main/java/org/jeecg/api/service/AppletIndexService.java @@ -43,7 +43,7 @@ public interface AppletIndexService { //创建订单 - Result createOrder(String token,String shopId,Integer num,String addressId,Integer payType,String couponId,Integer isGive,Integer memberNum,Integer giveNum); + Result createOrder(String token,String shopId,Integer num,String addressId,Integer payType,String couponId,Integer isGive,Integer memberNum,Integer giveNum,String remark); //再次支付 diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletIndexServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletIndexServiceImpl.java index 9d7d829..2e06984 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletIndexServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletIndexServiceImpl.java @@ -207,7 +207,10 @@ public class AppletIndexServiceImpl implements AppletIndexService { @Override public Result getRiceAdList(PageBean pageBean){ Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - Page page1 = commonIconService.page(page); + Page page1 = commonIconService + .lambdaQuery() + .orderByAsc(CommonIcon::getSort). + page(page); return Result.OK(page1); } @@ -222,20 +225,26 @@ public class AppletIndexServiceImpl implements AppletIndexService { @Override public Result getClassShopPageList(PageBean pageBean, String title,String classId){ Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - Page pageList = commonShopService.page(page); + Page pageList = commonShopService + .lambdaQuery() + .eq(CommonShop::getIsOpen,"Y") + .orderByAsc(CommonShop::getSort) + .page(page); //如果分类标识不为空 if(classId!=null){ pageList = commonShopService.lambdaQuery() .eq(CommonShop::getClassId,classId) - .orderByDesc(CommonShop::getCreateTime) + .eq(CommonShop::getIsOpen,"Y") + .orderByAsc(CommonShop::getSort) .page(page); if(StringUtils.isNotBlank(title)){ pageList = commonShopService.lambdaQuery() .eq(CommonShop::getCommonPidClassId,classId) + .eq(CommonShop::getIsOpen,"Y") .like(CommonShop::getTitle,title) - .orderByDesc(CommonShop::getCreateTime) + .orderByAsc(CommonShop::getSort) .page(page); } @@ -245,7 +254,8 @@ public class AppletIndexServiceImpl implements AppletIndexService { pageList = commonShopService.lambdaQuery() .like(CommonShop::getTitle,title) - .orderByDesc(CommonShop::getCreateTime) + .eq(CommonShop::getIsOpen,"Y") + .orderByAsc(CommonShop::getSort) .page(page); } @@ -433,7 +443,7 @@ public class AppletIndexServiceImpl implements AppletIndexService { //创建订单 @Override - public Result createOrder(String token,String shopId,Integer num,String addressId,Integer payType,String couponId,Integer isGive,Integer memberNum,Integer giveNum) { + public Result createOrder(String token,String shopId,Integer num,String addressId,Integer payType,String couponId,Integer isGive,Integer memberNum,Integer giveNum,String remark) { HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); //支付方式不能为空 if (payType==null){ @@ -534,6 +544,7 @@ public class AppletIndexServiceImpl implements AppletIndexService { commonOrder.setPhone(commonAddress.getPhone()); commonOrder.setAddress(commonAddress.getAddress()); commonOrder.setAddressDetails(commonAddress.getAddressDetails()); + commonOrder.setRemark(remark); commonOrder.setUserId(hanHaiMember.getId()); commonOrder.setAddressId(addressId); @@ -1942,16 +1953,19 @@ public class AppletIndexServiceImpl implements AppletIndexService { pageList.getRecords().forEach(item->{ //创建一个新的对象 FansPageBean fansPageBean1 = new FansPageBean(); + fansPageBean1.setPhone(item.getPhone()); fansPageBean1.setHeadImage(item.getHeadImage()); fansPageBean1.setNickName(item.getNickName()); - //查询该用户的订单数量 + //查询该用户的订单数量,count中的state>0 + int count = commonOrderService.lambdaQuery() + .in(CommonOrder::getState,1,2,3) .eq(CommonOrder::getUserId,item.getId()) .count().intValue(); fansPageBean1.setOrderNum(count); //查询该用户的佣金之和 - BigDecimal commission = new BigDecimal(10); + BigDecimal commission = new BigDecimal(0); fansPageBean1.setCommission(commission); fansPageBean1.setCreateTime(item.getCreateTime()); diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java index 4015921..ded4fa8 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java @@ -82,7 +82,7 @@ public class AppletLoginServiceImpl implements AppletLoginService { member = new HanHaiMember(); // member.setSesssionKey(sessionKey); member.setAppletOpenid(wxOpenid); - member.setNickName("陌美人"+System.currentTimeMillis()); +// member.setNickName("陌美人"+System.currentTimeMillis()); member.setHeadImage(loginReq.getHeadimgurl()); member.setShareId(loginReq.getShareId()); diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/controller/CommonOrderController.java b/module-common/src/main/java/org/jeecg/modules/commonOrder/controller/CommonOrderController.java index 491d203..ac4db8a 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonOrder/controller/CommonOrderController.java +++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/controller/CommonOrderController.java @@ -67,6 +67,7 @@ public class CommonOrderController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(commonOrder, req.getParameterMap()); + queryWrapper.like("title", commonOrder.getTitle()); Page page = new Page(pageNo, pageSize); IPage pageList = commonOrderService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java b/module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java index 0fbbe07..1e4d94e 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java +++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java @@ -175,6 +175,11 @@ public class CommonOrder implements Serializable { @ApiModelProperty(value = "抽奖总次数") private java.lang.Integer giveNum; + @Excel(name = "订单备注", width = 15) + @ApiModelProperty(value = "订单备注") + private java.lang.String remark; + + @TableField(exist = false) private List commonOrderSkuList; diff --git a/module-common/src/main/java/org/jeecg/modules/commonShop/entity/CommonShop.java b/module-common/src/main/java/org/jeecg/modules/commonShop/entity/CommonShop.java index 2c49590..eb6cad4 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonShop/entity/CommonShop.java +++ b/module-common/src/main/java/org/jeecg/modules/commonShop/entity/CommonShop.java @@ -56,6 +56,13 @@ public class CommonShop implements Serializable { @Excel(name = "标题", width = 15) @ApiModelProperty(value = "标题") private java.lang.String title; + + /**上架*/ + @Excel(name = "上架", width = 15) + @ApiModelProperty(value = "上架") + private java.lang.String isOpen; + + /**主图*/ @Excel(name = "主图", width = 15) @ApiModelProperty(value = "主图") @@ -182,4 +189,9 @@ public class CommonShop implements Serializable { @Excel(name = "合伙人【间推】返佣", width = 15) @ApiModelProperty(value = "合伙人【间推】返佣") private java.math.BigDecimal shopUseerMoneyTwo; + + /**排序*/ + @Excel(name = "排序", width = 15) + @ApiModelProperty(value = "排序") + private java.lang.Integer sort; }