付款时优惠卷列表

src/main/java/com/peanut/modules/book/controller/UserRecordController.java

@@ -1,9 +1,11 @@
 package com.peanut.modules.book.controller;
 
 import cn.com.marsoft.tool.ToolObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.peanut.common.utils.PageUtils;
 import com.peanut.common.utils.R;
+import com.peanut.common.utils.ShiroUtils;
 import com.peanut.modules.book.service.*;
 import com.peanut.modules.common.entity.*;
 import lombok.extern.slf4j.Slf4j;
@@ -60,7 +62,7 @@ public class UserRecordController {
 
         List list = new ArrayList<>();
         //此处bookid实际传的是商品id
-        List<UserRecord> bookid = userRecordService.getBaseMapper().selectList(new QueryWrapper<UserRecord>().eq("bookid", userRecordEntity.getBookid()).orderByDesc("create_date"));
+        List<UserRecord> bookid = userRecordService.getBaseMapper().selectList(new QueryWrapper<UserRecord>().eq("product_id", userRecordEntity.getProductId()).orderByDesc("create_date"));
 
 
         if (bookid != null) {
@@ -232,44 +234,4 @@ public class UserRecordController {
         return R.ok("成功").put("userRecordEntity", recordEntity);
     }
 
-    /*
-    TODO 老版本接口，新版本上线后要删除
-     */
-    @RequestMapping("/UserRecordcomment")
-    public R commodity(@RequestBody UserRecord recordEntity) {
-        //todo  已收货限制字段，只可评价一次
-        BuyOrder buyOrder = buyOrderService.getBaseMapper().selectOne(new QueryWrapper<BuyOrder>()
-                .eq("order_sn", recordEntity.getOrderSn())
-        );
-
-        Integer orderId = buyOrder.getOrderId();
-        BuyOrderDetail detailEntity = buyOrderDetailService.getBaseMapper().selectOne(new QueryWrapper<BuyOrderDetail>().eq("Order_id", orderId).eq("product_id", recordEntity.getBookid()));
-        Integer orderId1 = detailEntity.getOrderId();
-        UserRecord userRecordEntity = userRecordService.getBaseMapper().selectOne(new QueryWrapper<UserRecord>().eq("orderSn", recordEntity.getOrderSn()).eq("userid", recordEntity.getUserid()).eq("orderdid", orderId1).last("LIMIT 1"));
-
-        if (userRecordEntity != null) {
-            return R.error("您已评价过");
-        }
-        if (recordEntity.getImages() != null) {
-            List<Map<String, String>> imageList = (ArrayList<Map<String, String>>) recordEntity.getImages();
-            String imageStr = "";
-            for (Map m : imageList) {
-                imageStr += m.get("url") + ",";
-
-            }
-
-
-            recordEntity.setImages(imageStr);
-        }
-        recordEntity.setDelflag(0);
-        recordEntity.setOrderdId(orderId1);
-        userRecordService.saveOrUpdate(recordEntity);
-
-
-        detailEntity.setRecordId(1);
-        buyOrderDetailService.saveOrUpdate(detailEntity);
-
-
-        return R.ok("成功").put("userRecordEntity", recordEntity);
-    }
 }

src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java

@@ -9,10 +9,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.peanut.common.utils.ExcludeEmptyQueryWrapper;
+import com.peanut.common.utils.*;
-import com.peanut.common.utils.PageUtils;
-import com.peanut.common.utils.Query;
-import com.peanut.common.utils.R;
 import com.peanut.config.Constants;
 import com.peanut.modules.common.dao.*;
 import com.peanut.modules.book.service.*;
@@ -62,7 +59,7 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
     ShopProductService shopProductService;
 
     @Autowired
-    private BookService bookService;
+    private UserRecordDao userRecordDao;
 
     @Autowired
     private BuyOrderDao buyOrderDao;
@@ -489,6 +486,13 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
                     .eq(BuyOrderProduct::getOrderId, b.getOrderId()));
             for (BuyOrderProduct bb : buyOrderProducts){
                 bb.setProduct(shopProductService.getById(bb.getProductId()));
+                UserRecord userRecord = userRecordDao.selectOne(new QueryWrapper<UserRecord>()
+                        .eq("userid", ShiroUtils.getUId())
+                        .eq("orderdid", b.getOrderId())
+                        .eq("product_id", bb.getProductId()));
+                if (userRecord!=null){
+                    bb.setRecordId(userRecord.getId());
+                }
             }
             b.setProductList(buyOrderProducts);
             b.setTimestamp(b.getCreateTime().getTime()/1000);

src/main/java/com/peanut/modules/common/controller/CouponController.java

@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.peanut.common.utils.R;
-import com.peanut.modules.common.entity.CouponEntity;
+import com.peanut.modules.book.service.BuyOrderProductService;
-import com.peanut.modules.common.entity.CouponHistory;
+import com.peanut.modules.common.entity.*;
-import com.peanut.modules.common.entity.MyUserEntity;
+import com.peanut.modules.common.service.BuyOrderService;
 import com.peanut.modules.common.service.CouponHistoryService;
 import com.peanut.modules.common.service.CouponService;
 import lombok.extern.slf4j.Slf4j;
@@ -15,7 +15,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 @Slf4j
 @RestController("commonCoupon")
@@ -26,6 +29,10 @@ public class CouponController {
     private CouponService couponService;
     @Autowired
     private CouponHistoryService couponHistoryService;
+    @Autowired
+    private BuyOrderService buyOrderService;
+    @Autowired
+    private BuyOrderProductService buyOrderProductService;
 
     //优惠卷列表
     @RequestMapping("/getCouponList")
@@ -150,4 +157,18 @@ public class CouponController {
         return couponService.insertCouponHistory(couponId,userId,getType);
     }
 
+    //当前优惠卷可用商品
+    @RequestMapping("/getShopProductByCoupon")
+    public R getShopProductByCoupon(@RequestBody Map<String,Object> params){
+        Set<Integer> l = couponService.getShopProductByCoupon(Integer.parseInt(params.get("couponId").toString()));
+        return R.ok().put("productIds",l);
+    }
+
+    //付款时优惠卷列表
+    @RequestMapping("/getCouponListPayment")
+    public R getCouponListPayment(@RequestBody Map<String,Object> params){
+        List<CouponHistory> couponHistoryList = couponService.getCouponListPayment(params);
+        return R.ok().put("couponHistoryList",couponHistoryList);
+    }
+
 }

src/main/java/com/peanut/modules/common/entity/CouponEntity.java

@@ -69,4 +69,6 @@ public class CouponEntity {
 
     @TableField(exist = false)
     private List<Object> rangeList;
+    @TableField(exist = false)
+    private String usable;
 }

src/main/java/com/peanut/modules/common/service/CouponService.java

@@ -3,6 +3,11 @@ package com.peanut.modules.common.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.peanut.common.utils.R;
 import com.peanut.modules.common.entity.CouponEntity;
+import com.peanut.modules.common.entity.CouponHistory;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 
 public interface CouponService extends IService<CouponEntity> {
@@ -13,4 +18,8 @@ public interface CouponService extends IService<CouponEntity> {
 
     R insertCouponHistory(int couponId, int userId,int getType);
 
+    List<CouponHistory> getCouponListPayment(Map<String,Object> params);
+
+    Set<Integer> getShopProductByCoupon(int couponId);
+
 }

src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java

@@ -50,6 +50,8 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
     @Autowired
     private ClassExamUserDao classExamUserDao;
     @Autowired
+    private CourseCatalogueDao courseCatalogueDao;
+    @Autowired
     private CourseCatalogueChapterDao courseCatalogueChapterDao;
     @Autowired
     private RabbitTemplate rabbitTemplate;
@@ -288,13 +290,17 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
                         List<ClassCourse> courses = classCourseDao.selectList(new LambdaQueryWrapper<ClassCourse>()
                                 .eq(ClassCourse::getModelId,classEntity.getModelId()));
                         for (ClassCourse classCourse:courses){
-                            List<UserCourseBuyEntity> ucb = userCourseBuyDao.selectList(new LambdaQueryWrapper<UserCourseBuyEntity>()
+                            List<CourseCatalogueEntity> catalogues = courseCatalogueDao.selectList(new LambdaQueryWrapper<CourseCatalogueEntity>()
-                                    .eq(UserCourseBuyEntity::getUserId,classUser.getUserId())
+                                    .eq(CourseCatalogueEntity::getCourseId,classCourse.getCourseId()));
-                                    .eq(UserCourseBuyEntity::getCourseId,classCourse.getCourseId()));
+                            for (CourseCatalogueEntity catalog:catalogues){
-                            if (ucb.size() == 0){
+                                int ucbCount = userCourseBuyDao.selectCount(new LambdaQueryWrapper<UserCourseBuyEntity>()
-                                flag = true;
+                                        .eq(UserCourseBuyEntity::getUserId,classUser.getUserId())
-                                CourseEntity c = courseDao.selectById(classCourse.getCourseId());
+                                        .eq(UserCourseBuyEntity::getCatalogueId,catalog.getId()));
-                                sb.append("用户"+ user.getTel()+"未购买课程"+c.getTitle()+";\n");
+                                if (ucbCount == 0){
+                                    flag = true;
+                                    CourseEntity c = courseDao.selectById(classCourse.getCourseId());
+                                    sb.append("用户"+ user.getTel()+"未购买课程"+c.getTitle()+"-"+catalog.getTitle()+";\n");
+                                }
                             }
                         }
                         if (flag) {

src/main/java/com/peanut/modules/common/service/impl/CouponServiceImpl.java

@@ -2,28 +2,24 @@ package com.peanut.modules.common.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.peanut.common.utils.DateUtil;
 import com.peanut.common.utils.DateUtils;
 import com.peanut.common.utils.R;
+import com.peanut.common.utils.ShiroUtils;
 import com.peanut.config.DelayQueueConfig;
-import com.peanut.modules.common.dao.CouponDao;
+import com.peanut.modules.common.dao.*;
-import com.peanut.modules.common.dao.CouponHistoryDao;
+import com.peanut.modules.common.entity.*;
-import com.peanut.modules.common.dao.CourseDao;
-import com.peanut.modules.common.dao.CourseMedicineDao;
-import com.peanut.modules.common.entity.CouponEntity;
-import com.peanut.modules.common.entity.CouponHistory;
-import com.peanut.modules.common.entity.CourseEntity;
-import com.peanut.modules.common.entity.CourseMedicine;
 import com.peanut.modules.common.service.CouponService;
+import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.amqp.core.MessagePostProcessor;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import java.util.ArrayList;
+
-import java.util.Date;
+import java.util.*;
-import java.util.List;
 
 @Slf4j
 @Service("commonCouponService")
@@ -39,6 +35,10 @@ public class CouponServiceImpl extends ServiceImpl<CouponDao, CouponEntity> impl
     private CourseMedicineDao courseMedicineDao;
     @Autowired
     private RabbitTemplate rabbitTemplate;
+    @Autowired
+    private ShopProductDao shopProductDao;
+    @Autowired
+    private ShopProductCourseDao shopProductCourseDao;
 
     @Override
     public CouponEntity getByIdSetRange(int id) {
@@ -107,7 +107,6 @@ public class CouponServiceImpl extends ServiceImpl<CouponDao, CouponEntity> impl
             return R.error("优惠卷已放完");
         }
     }
-
     private MessagePostProcessor messagePostProcessor(long date) {
         return message -> {
             message.getMessageProperties().setDelay((int)date);
@@ -115,4 +114,76 @@ public class CouponServiceImpl extends ServiceImpl<CouponDao, CouponEntity> impl
         };
     }
 
+    @Override
+    public List<CouponHistory> getCouponListPayment(Map<String, Object> params) {
+        List<CouponHistory> res = new ArrayList<>();
+        List<CouponHistory> couponHistoryList = couponHistoryDao.selectList(new LambdaQueryWrapper<CouponHistory>()
+                .eq(CouponHistory::getUserId, ShiroUtils.getUId())
+                .eq(CouponHistory::getStatus,0));
+        if (couponHistoryList.size() > 0) {
+            for (CouponHistory couponHistory : couponHistoryList) {
+                if (couponHistory.getEffectType()==0){
+                    res.add(couponHistory);
+                }else {
+                    List<ShopProduct> shopProductList = shopProductDao.selectList(new MPJLambdaWrapper<ShopProduct>()
+                            .leftJoin(BuyOrderProduct.class,BuyOrderProduct::getProductId,ShopProduct::getProductId)
+                            .eq(BuyOrderProduct::getOrderId,params.get("orderId").toString()));
+                    for (ShopProduct shopProduct : shopProductList) {
+                        Set<Integer> set = getShopProductByCoupon(couponHistory.getCouponId());
+                        if(!set.add(shopProduct.getProductId())){
+                            res.add(couponHistory);
+                        }
+                    }
+                }
+            }
+        }
+        return res;
+    }
+
+    @Override
+    public Set<Integer> getShopProductByCoupon(int couponId) {
+        Set<Integer> set = new HashSet<>();
+        CouponEntity couponEntity = couponDao.selectById(couponId);
+        if (couponEntity!=null){
+            String[] strs = couponEntity.getRangeInfo().split(",");
+            if (couponEntity.getCouponRange()==1) {
+                for (String courseId : strs) {
+                    List<ShopProductCourseEntity> shopProductCourseList = shopProductCourseDao.selectList(new LambdaQueryWrapper<ShopProductCourseEntity>()
+                            .eq(ShopProductCourseEntity::getCourseId,courseId));
+                    for (ShopProductCourseEntity shopProductCourseEntity : shopProductCourseList) {
+                        set.add(shopProductCourseEntity.getProductId());
+                    }
+                }
+            }else if (couponEntity.getCouponRange()==2) {
+                for (String courseMedical : strs) {
+                    MPJLambdaWrapper<ShopProductCourseEntity> wrapper = new MPJLambdaWrapper<>();
+                    wrapper.leftJoin(CourseToMedicine.class,CourseToMedicine::getCourseId,ShopProductCourseEntity::getCourseId);
+                    List l = new ArrayList();
+                    getCourseMedicalIds(Integer.parseInt(courseMedical),l);
+                    wrapper.in(CourseToMedicine::getMedicalId,l);
+                    wrapper.selectAll(ShopProductCourseEntity.class);
+                    List<ShopProductCourseEntity> shopProductCourseList = shopProductCourseDao.selectList(wrapper);
+                    for (ShopProductCourseEntity shopProductCourseEntity : shopProductCourseList) {
+                        set.add(shopProductCourseEntity.getProductId());
+                    }
+                }
+            }
+        }
+        return set;
+    }
+
+    public void getCourseMedicalIds(int courseMedicalId,List<Integer> list){
+        CourseMedicine courseMedicine = courseMedicineDao.selectById(courseMedicalId);
+        if (courseMedicine.getIsLast()==1){
+            list.add(courseMedicine.getId());
+        }else {
+            List<CourseMedicine> cms = courseMedicineDao.selectList(new LambdaQueryWrapper<CourseMedicine>()
+                    .eq(CourseMedicine::getPid,courseMedicine.getId()));
+            for (CourseMedicine cm : cms) {
+                getCourseMedicalIds(cm.getId(),list);
+            }
+        }
+    }
+
+
 }