fix

jeecg-mall-api/src/main/java/org/jeecg/modules/bus/controller/CouponsCashUsedController.java

@@ -9,9 +9,12 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+
+import cn.hutool.system.UserInfo;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hpsf.Decimal;
 import org.jeecg.annotation.ApiLogin;
 import org.jeecg.com.util.ThirdSessionHolder;
@@ -37,7 +40,10 @@ import lombok.extern.slf4j.Slf4j;
 
 import org.jeecg.modules.business.service.IBusMarketCouponsService;
 import org.jeecg.modules.business.service.IBusMarketCouponsUsedService;
+import org.jeecg.modules.mall.entity.MallUserInfo;
 import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.wxuser.service.IUserInfoService;
+import org.jeecg.modules.wxuser.service.impl.UserInfoServiceImpl;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -68,6 +74,8 @@ public class CouponsCashUsedController extends WebConfig {
     private IBusMarketCouponsService busMarketCouponsService;
     @Resource
 private IBusMarketCouponsCashService busMarketCouponsCashService;
+    @Resource
+    private IUserInfoService userInfoService;
     /**
      * 获取我的可用优惠券分页列表查询
      *
@@ -87,22 +95,26 @@ private IBusMarketCouponsCashService busMarketCouponsCashService;
                                                                  HttpServletRequest req) {
         String tenantId = TenantContextHolder.getTenantId();
         String userId = ThirdSessionHolder.getUserId();
-        LambdaQueryWrapper<BusMarketCouponsCashUsed> queryWrapper = QueryGenerator.initQueryWrapper(busMarketCouponsCashUsed, req.getParameterMap()).lambda();
-        queryWrapper.eq(BusMarketCouponsCashUsed::getUserid, userId);
-        queryWrapper.eq(BusMarketCouponsCashUsed::getTenantId, tenantId);
-        queryWrapper.eq(BusMarketCouponsCashUsed::getStatus, 1);
-        Page<BusMarketCouponsCashUsed> page = new Page<BusMarketCouponsCashUsed>(pageNo, pageSize);
-        IPage<BusMarketCouponsCashUsed> pageList = busMarketCouponsCashUsedService.page(page, queryWrapper);
-        pageList.getRecords().forEach(item -> {
-            BusMarketCouponsCash coupons = busMarketCouponsCashService.getById(item.getCouponsId());
-            if (coupons != null) {
-                item.setBusMarketCouponsCash(coupons);
-            }
-            CouponsStatusEnum couponsStatusEnum = CouponsStatusEnum.val(item.getStatus());
-            if (couponsStatusEnum != null) {
-                item.setStatusName(couponsStatusEnum.getTitle());
-            }
-        });
-        return Result.OK(pageList);
+        MallUserInfo mallUserInfo = userInfoService.getById(userId);
+        if (StringUtils.isNotBlank(mallUserInfo.getMobile())) {
+            LambdaQueryWrapper<BusMarketCouponsCashUsed> queryWrapper = QueryGenerator.initQueryWrapper(busMarketCouponsCashUsed, req.getParameterMap()).lambda();
+            queryWrapper.eq(BusMarketCouponsCashUsed::getMobile, mallUserInfo.getMobile());
+            queryWrapper.eq(BusMarketCouponsCashUsed::getTenantId, tenantId);
+            queryWrapper.eq(BusMarketCouponsCashUsed::getStatus, 1);
+            Page<BusMarketCouponsCashUsed> page = new Page<BusMarketCouponsCashUsed>(pageNo, pageSize);
+            IPage<BusMarketCouponsCashUsed> pageList = busMarketCouponsCashUsedService.page(page, queryWrapper);
+            pageList.getRecords().forEach(item -> {
+                BusMarketCouponsCash coupons = busMarketCouponsCashService.getById(item.getCouponsId());
+                if (coupons != null) {
+                    item.setBusMarketCouponsCash(coupons);
+                }
+                CouponsStatusEnum couponsStatusEnum = CouponsStatusEnum.val(item.getStatus());
+                if (couponsStatusEnum != null) {
+                    item.setStatusName(couponsStatusEnum.getTitle());
+                }
+            });
+            return Result.OK(pageList);
+        }
+        return Result.OK(null);
     }
 }

jeecg-mall-api/src/main/java/org/jeecg/modules/bus/controller/CouponsUsedController.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.jeecg.annotation.ApiLogin;
 import org.jeecg.com.util.ThirdSessionHolder;
 import org.jeecg.common.api.vo.Result;
@@ -29,6 +30,8 @@ import org.jeecg.modules.business.entity.BusMarketCouponsUsed;
 import org.jeecg.modules.business.enums.CouponsStatusEnum;
 import org.jeecg.modules.business.service.IBusMarketCouponsService;
 import org.jeecg.modules.business.service.IBusMarketCouponsUsedService;
+import org.jeecg.modules.mall.entity.MallUserInfo;
+import org.jeecg.modules.wxuser.service.IUserInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -48,6 +51,8 @@ public class CouponsUsedController extends WebConfig {
    private IBusMarketCouponsUsedService busMarketCouponsUsedService;
     @Resource
     private IBusMarketCouponsService busMarketCouponsService;
+    @Resource
+    private IUserInfoService userInfoService;
    /**
     * 获取我的可用优惠券分页列表查询
     *
@@ -67,25 +72,29 @@ public class CouponsUsedController extends WebConfig {
                                   HttpServletRequest req) {
        String tenantId = TenantContextHolder.getTenantId();
        String userId = ThirdSessionHolder.getUserId();
-       LambdaQueryWrapper<BusMarketCouponsUsed> queryWrapper = QueryGenerator.initQueryWrapper(busMarketCouponsUsed, req.getParameterMap()).lambda();
-       queryWrapper.eq(BusMarketCouponsUsed::getUserid, userId);
-       queryWrapper.eq(BusMarketCouponsUsed::getTenantId, tenantId);
-       queryWrapper.eq(BusMarketCouponsUsed::getStatus, 1);
-       Page<BusMarketCouponsUsed> page = new Page<BusMarketCouponsUsed>(pageNo, pageSize);
-       IPage<BusMarketCouponsUsed> pageList = busMarketCouponsUsedService.page(page, queryWrapper);
-       if (pageList.getRecords().size() > 0) {
-           pageList.getRecords().forEach(item -> {
-               BusMarketCoupons coupons = busMarketCouponsService.getById(item.getCouponsId());
-               if (coupons != null) {
-                   item.setConponsName(coupons.getName());
-               }
-               CouponsStatusEnum couponsStatusEnum = CouponsStatusEnum.val(item.getStatus());
-               if (couponsStatusEnum != null) {
-                   item.setStatusName(couponsStatusEnum.getTitle());
-               }
-           });
+       MallUserInfo mallUserInfo = userInfoService.getById(userId);
+       if (StringUtils.isNotBlank(mallUserInfo.getMobile())) {
+           LambdaQueryWrapper<BusMarketCouponsUsed> queryWrapper = QueryGenerator.initQueryWrapper(busMarketCouponsUsed, req.getParameterMap()).lambda();
+           queryWrapper.eq(BusMarketCouponsUsed::getUserid, userId);
+           queryWrapper.eq(BusMarketCouponsUsed::getTenantId, tenantId);
+           queryWrapper.eq(BusMarketCouponsUsed::getStatus, 1);
+           Page<BusMarketCouponsUsed> page = new Page<BusMarketCouponsUsed>(pageNo, pageSize);
+           IPage<BusMarketCouponsUsed> pageList = busMarketCouponsUsedService.page(page, queryWrapper);
+           if (pageList.getRecords().size() > 0) {
+               pageList.getRecords().forEach(item -> {
+                   BusMarketCoupons coupons = busMarketCouponsService.getById(item.getCouponsId());
+                   if (coupons != null) {
+                       item.setConponsName(coupons.getName());
+                   }
+                   CouponsStatusEnum couponsStatusEnum = CouponsStatusEnum.val(item.getStatus());
+                   if (couponsStatusEnum != null) {
+                       item.setStatusName(couponsStatusEnum.getTitle());
+                   }
+               });
+           }
+           return Result.OK(pageList);
        }
-       return Result.OK(pageList);
+       return Result.OK(null);
    }
 
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mall/service/impl/MallOrderGoodsDetailServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.mall.service.impl;
+
+import org.jeecg.modules.mall.entity.MallOrderGoodsDetail;
+import org.jeecg.modules.mall.mapper.MallOrderGoodsDetailMapper;
+import org.jeecg.modules.mall.service.IMallOrderGoodsDetailService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: mall_order_goods_detail
+ * @Author: jeecg-boot
+ * @Date:   2023-05-06
+ * @Version: V1.0
+ */
+@Service
+public class MallOrderGoodsDetailServiceImpl extends ServiceImpl<MallOrderGoodsDetailMapper, MallOrderGoodsDetail> implements IMallOrderGoodsDetailService {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mall/service/impl/MallOrderGoodsServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.mall.service.impl;
+
+import org.jeecg.modules.mall.entity.MallOrderGoods;
+import org.jeecg.modules.mall.mapper.MallOrderGoodsMapper;
+import org.jeecg.modules.mall.service.IMallOrderGoodsService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: mall_order_goods
+ * @Author: jeecg-boot
+ * @Date:   2023-05-06
+ * @Version: V1.0
+ */
+@Service
+public class MallOrderGoodsServiceImpl extends ServiceImpl<MallOrderGoodsMapper, MallOrderGoods> implements IMallOrderGoodsService {
+
+}