fix 业务员下单

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/mapper/OrderGoodsMapper.java

@@ -25,4 +25,6 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
 
     List<OrderGoodsVo> selectOrderTwoGoods(OrderGoodsQueryBo orderGoodsQueryBo);
     Long getBuyGoodsHistory(OrderGoodsQueryBo bo);
+
+    List<OrderGoodsVo> sendGoods();
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/IOrderGoodsService.java

@@ -60,4 +60,6 @@ public interface IOrderGoodsService extends IService<OrderGoods> {
 	List<OrderGoodsVo> selectOrderGoods();
 
 	List<OrderGoodsVo> selectOrderTwoGoods();
+
+	List<OrderGoodsVo> sendGoods();
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderGoodsServiceImpl.java

@@ -195,6 +195,11 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
         return baseMapper.selectOrderTwoGoods(orderGoodsQueryBo);
     }
 
+    @Override
+    public List<OrderGoodsVo> sendGoods() {
+        return baseMapper.sendGoods();
+    }
+
     public boolean joinGrade(Long orderGoodsId,Long gradeId,Long userId,Long goodsId){
         ClassGradeVo classGradeVo = iClassGradeService.queryById(gradeId);
         if(classGradeVo==null){

zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -19,6 +19,7 @@ import com.zhongzheng.common.utils.polyv.PolyvUtils;
 import com.zhongzheng.modules.base.service.IProfileTpService;
 import com.zhongzheng.modules.base.vo.ProfileTpVo;
 import com.zhongzheng.modules.base.vo.UserProfileVo;
+import com.zhongzheng.modules.exam.domain.ExamNumber;
 import com.zhongzheng.modules.exam.vo.ExamUserApplyVo;
 import com.zhongzheng.modules.goods.service.IGoodsService;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
@@ -59,8 +60,12 @@ import com.zhongzheng.modules.polyv.vo.PolyvVideoQuerVo;
 import com.zhongzheng.modules.polyv.vo.PolyvVideoVo;
 import com.zhongzheng.modules.polyv.vo.PolyvVo;
 import com.zhongzheng.modules.schedule.service.IScheduleService;
+import com.zhongzheng.modules.user.bo.UserExamGoodsSupplementAddBo;
 import com.zhongzheng.modules.user.bo.UserQueryBo;
+import com.zhongzheng.modules.user.domain.UserExamGoods;
 import com.zhongzheng.modules.user.domain.UserSubscribe;
+import com.zhongzheng.modules.user.service.IUserExamGoodsService;
+import com.zhongzheng.modules.user.service.IUserExamGoodsSupplementService;
 import com.zhongzheng.modules.user.service.IUserService;
 import com.zhongzheng.modules.user.service.IUserSubscribeService;
 import com.zhongzheng.modules.user.vo.UserSubscribeVo;
@@ -102,6 +107,9 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
     @Autowired
     private OrderMapper orderMapper;
 
+    @Autowired
+    private IUserExamGoodsSupplementService userExamGoodsSupplementService;
+
     @Autowired
     private com.zhongzheng.modules.alisms.service.IAliSmsService IAliSmsService;
 
@@ -127,6 +135,9 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
     @Autowired
     private IUserService iUserService;
 
+    @Autowired
+    private IUserExamGoodsService userExamGoodsService;
+
     @Autowired
     private IClassGradeUserTempService iClassGradeUserTempService;
 
@@ -235,9 +246,34 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                 }
             }
         }
+        sendGoods();
         return "请求成功";
     }
 
+    private void sendGoods() {
+        List<OrderGoodsVo> orderGoodsVo = iOrderGoodsService.sendGoods();
+        for (OrderGoodsVo goodsVo : orderGoodsVo) {
+            ExamNumber examNumber = userExamGoodsService.queryExam(goodsVo.getGoodsId());
+            if (examNumber != null) {
+                UserExamGoods add = new UserExamGoods();
+                add.setGoodsId(goodsVo.getGoodsId());
+                add.setUserId(goodsVo.getUserId());
+                add.setExamNumber(examNumber.getExamNumber());
+                add.setDoNumber(examNumber.getDoNumber());
+                add.setCreateTime(DateUtils.getNowTime());
+                add.setUpdateTime(DateUtils.getNowTime());
+                userExamGoodsService.save(add);
+                UserExamGoodsSupplementAddBo userExamGoodsSupplementAddBo = new UserExamGoodsSupplementAddBo();
+                userExamGoodsSupplementAddBo.setGoodsId(goodsVo.getGoodsId());
+                userExamGoodsSupplementAddBo.setUserExamGoodsId(add.getUserExamGoodsId());
+                userExamGoodsSupplementAddBo.setExamNumber(examNumber.getExamNumber());
+                userExamGoodsSupplementAddBo.setDoNumber(examNumber.getDoNumber());
+                userExamGoodsSupplementAddBo.setStatus(3);
+                userExamGoodsSupplementService.insertByAddBo(userExamGoodsSupplementAddBo);
+            }
+        }
+    }
+
     @Override
     public void updateExamSend(UserQueryBo bo) {
         //新考预约提醒

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserExamGoodsMapper.java

@@ -24,5 +24,5 @@ public interface UserExamGoodsMapper extends BaseMapper<UserExamGoods> {
 
     Long queryExamGoods(@Param("goodsId") Long goodsId,@Param("userId") Long userId);
 
-    ExamNumber queryExamGoodsVo(@Param("goodsId") Long goodsId,@Param("userId") Long userId);
+    ExamNumber queryExamGoodsVo(@Param("goodsId") Long goodsId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserExamGoodsService.java

@@ -57,5 +57,6 @@ public interface IUserExamGoodsService extends IService<UserExamGoods> {
 
     Long queryExamGoods(Long goodsId,Long userId);
 
-	ExamNumber queryExamGoodsVo(Long goodsId, Long userId);
+	ExamNumber queryExam(Long goodsId);
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserExamGoodsServiceImpl.java

@@ -146,7 +146,7 @@ public class UserExamGoodsServiceImpl extends ServiceImpl<UserExamGoodsMapper, U
     }
 
     @Override
-    public ExamNumber queryExamGoodsVo(Long goodsId, Long userId) {
-        return baseMapper.queryExamGoodsVo(goodsId,userId);
+    public ExamNumber queryExam(Long goodsId) {
+        return baseMapper.queryExamGoodsVo(goodsId);
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/wx/service/impl/WxPayServiceImpl.java

@@ -339,22 +339,24 @@ public class WxPayServiceImpl  implements IWxPayService {
         //添加商品考试次数和补考次数
         if (goodsVo.getGoodsType().equals(1)){
             if (userExamGoodsService.queryExamGoods(goodsVo.getGoodsId(),order.getUserId()) < 1){
-                ExamNumber examNumber = userExamGoodsService.queryExamGoodsVo(goodsVo.getGoodsId(),order.getUserId());
-                UserExamGoods add = new UserExamGoods();
-                add.setGoodsId(g.getGoodsId());
-                add.setUserId(order.getUserId());
-                add.setExamNumber(examNumber.getExamNumber());
-                add.setDoNumber(examNumber.getDoNumber());
-                add.setCreateTime(DateUtils.getNowTime());
-                add.setUpdateTime(DateUtils.getNowTime());
-                userExamGoodsService.save(add);
-                UserExamGoodsSupplementAddBo userExamGoodsSupplementAddBo = new UserExamGoodsSupplementAddBo();
-                userExamGoodsSupplementAddBo.setGoodsId(goodsVo.getGoodsId());
-                userExamGoodsSupplementAddBo.setUserExamGoodsId(add.getUserExamGoodsId());
-                userExamGoodsSupplementAddBo.setExamNumber(examNumber.getExamNumber());
-                userExamGoodsSupplementAddBo.setDoNumber(examNumber.getDoNumber());
-                userExamGoodsSupplementAddBo.setStatus(3);
-                userExamGoodsSupplementService.insertByAddBo(userExamGoodsSupplementAddBo);
+                ExamNumber examNumber = userExamGoodsService.queryExam(goodsVo.getGoodsId());
+                if (examNumber != null) {
+                    UserExamGoods add = new UserExamGoods();
+                    add.setGoodsId(g.getGoodsId());
+                    add.setUserId(order.getUserId());
+                    add.setExamNumber(examNumber.getExamNumber());
+                    add.setDoNumber(examNumber.getDoNumber());
+                    add.setCreateTime(DateUtils.getNowTime());
+                    add.setUpdateTime(DateUtils.getNowTime());
+                    userExamGoodsService.save(add);
+                    UserExamGoodsSupplementAddBo userExamGoodsSupplementAddBo = new UserExamGoodsSupplementAddBo();
+                    userExamGoodsSupplementAddBo.setGoodsId(goodsVo.getGoodsId());
+                    userExamGoodsSupplementAddBo.setUserExamGoodsId(add.getUserExamGoodsId());
+                    userExamGoodsSupplementAddBo.setExamNumber(examNumber.getExamNumber());
+                    userExamGoodsSupplementAddBo.setDoNumber(examNumber.getDoNumber());
+                    userExamGoodsSupplementAddBo.setStatus(3);
+                    userExamGoodsSupplementService.insertByAddBo(userExamGoodsSupplementAddBo);
+                }
             }
         }
         //增加前培次数

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -185,7 +185,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND (#{classStartTime} BETWEEN g.class_start_time and g.class_end_time or #{classEndTime} BETWEEN g.class_start_time and g.class_end_time)
         </if>
         <if test="pastDue != null or pastDue != null ">
-            AND (unix_timestamp(now()) BETWEEN g.class_start_time and g.class_end_time or g.class_start_time is null)
+            AND (unix_timestamp(now()) &lt; g.class_end_time or g.class_start_time is null)
         </if>
         <if test="educationTypeId != null and educationTypeId !='' ">
             AND (

zhongzheng-system/src/main/resources/mapper/modules/order/OrderGoodsMapper.xml

@@ -139,6 +139,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     </select>
 
+    <select id="sendGoods"  resultMap="OrderGoodsResultVo">
+        SELECT
+        og.*,
+        o.user_id
+        FROM
+        `order` o
+        LEFT JOIN order_goods og on o.order_sn = og.order_sn
+        where 1=1
+        and og.`status` = 1
+        and og.refund_status in (0,1,3)
+        and og.pay_status in (2,3)
+        and (SELECT COUNT(1) FROM user_exam_goods ueg where ueg.user_id = o.user_id and og.goods_id = ueg.goods_id) &lt; 1
+        and (SELECT COUNT(1) FROM exam_number en LEFT JOIN exam_number_goods eng on en.exam_number_id = eng.exam_number_id where eng.goods_id = og.goods_id and en.`status` = 1) > 0
+    </select>
+
     <select id="getBuyGoodsHistory" parameterType="com.zhongzheng.modules.order.bo.OrderGoodsQueryBo" resultType="Long">
         SELECT
             ifnull(count(*),0) num

zhongzheng-system/src/main/resources/mapper/modules/user/UserExamGoodsMapper.xml

@@ -101,8 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             exam_number en
                 LEFT JOIN exam_number_goods eng on eng.exam_number_id = en.exam_number_id
-                LEFT JOIN user_exam_goods ueg   on 	ueg.goods_id = eng.goods_id
-        where ueg.user_id = #{userId}
+        where 1=1
           AND ueg.goods_id = #{goodsId}
     </select>
 </mapper>