merge

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/domain/GoodsQuestionRel.java

@@ -32,8 +32,6 @@ private static final long serialVersionUID=1L;
     private Long questionGoodsId;
     /** 题库订单商品ID */
     private Long qsOrderGoodsId;
-    /** 学员预约ID */
-    private Long userSubscribeId;
     /** 做题次数 */
     private Long questionDoNum;
     /** 1有效 0无效 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderGoodsAddBo.java

@@ -89,6 +89,4 @@ public class OrderGoodsAddBo {
     private String distributionLinkCode;
     @ApiModelProperty("关联的订单商品ID")
     private Long relevanceId;
-    @ApiModelProperty("关联的学员预约ID")
-    private Long relevanceSubscribeId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/OrderGoods.java

@@ -96,7 +96,4 @@ private static final long serialVersionUID=1L;
     private BigDecimal divideMoney;
 
     private Long tenantId;
-
-    @TableField(exist = false)
-    private Long subscribeId;
 }

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

@@ -259,7 +259,6 @@ public class OrderInputServiceImpl extends ServiceImpl<OrderInputMapper, OrderIn
             //题库关联
             GoodsQuestionRel rel = new GoodsQuestionRel();
             rel.setOrderGoodsId(userSubscribe.getOrderGoodsId());
-            rel.setUserSubscribeId(userSubscribe.getSubscribeId());
             rel.setQsOrderGoodsId(add.getOrderGoodsId());
             rel.setQuestionGoodsId(orderGoods.getGoodsId());
             rel.setTenantId(tenantId);
@@ -290,7 +289,6 @@ public class OrderInputServiceImpl extends ServiceImpl<OrderInputMapper, OrderIn
         Long dayBefore = DateUtils.getDayBefore(examTime, 8);
         add.setServiceStartTime(dayBefore);
         add.setServiceEndTime(examTime);
-        add.setSubscribeId(subscribe.getSubscribeId());
         return add;
     }
 }

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

@@ -865,7 +865,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         rel.setOrderGoodsId(orderGoods.getOrderGoodsId());
         rel.setQuestionGoodsId(questionGoods.getGoodsId());
         rel.setQsOrderGoodsId(add.getOrderGoodsId());
-        rel.setUserSubscribeId(add.getSubscribeId());
         rel.setStatus(1);
         rel.setQuestionDoNum(merchant.getDoNum());
         rel.setCreateTime(DateUtils.getNowTime());
@@ -892,12 +891,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         Long dayBefore = DateUtils.getDayBefore(examTime, 8);
         add.setServiceStartTime(dayBefore);
         add.setServiceEndTime(examTime);
-        add.setSubscribeId(subscribe.getSubscribeId());
         return add;
     }
 
 
-    private void questionOrderHandle(Long orderGoodsId,Long goodsId,Long qsOrderGoodsId,Long subscribeId) {
+    private void questionOrderHandle(Long orderGoodsId,Long goodsId,Long qsOrderGoodsId) {
         //第三方题库商品
         Goods questionGoods = iGoodsService.getById(goodsId);
         if (ObjectUtils.isNull(questionGoods) || questionGoods.getGoodsType() != 9){
@@ -916,7 +914,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         rel.setStatus(1);
         rel.setQuestionDoNum(merchant.getDoNum());
         rel.setQsOrderGoodsId(qsOrderGoodsId);
-        rel.setUserSubscribeId(subscribeId);
         rel.setCreateTime(DateUtils.getNowTime());
         rel.setUpdateTime(DateUtils.getNowTime());
         iGoodsQuestionRelService.save(rel);
@@ -1011,9 +1008,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 payPrice = payPrice.add(goods.getStandPrice());
             }
             boolean orderGoodsRs = iOrderGoodsService.save(orderGoods);
-            if (ObjectUtils.isNotNull(g.getRelevanceId()) && ObjectUtils.isNotNull(g.getRelevanceSubscribeId())){
+            if (ObjectUtils.isNotNull(g.getRelevanceId())){
                 //购买关联题库商品
-                questionOrderHandle(g.getRelevanceId(),g.getGoodsId(),orderGoods.getOrderGoodsId(),g.getRelevanceSubscribeId());
+                questionOrderHandle(g.getRelevanceId(),g.getGoodsId(),orderGoods.getOrderGoodsId());
             }
             boolean canRepeatBuy = false;
             validUserBeforeBuy(goods, bo.getUserId());
@@ -1409,9 +1406,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 payPrice = payPrice.add(goods.getStandPrice());
             }
             boolean orderGoodsRs = iOrderGoodsService.save(orderGoods);
-            if (ObjectUtils.isNotNull(g.getRelevanceId()) && ObjectUtils.isNotNull(g.getRelevanceSubscribeId())){
+            if (ObjectUtils.isNotNull(g.getRelevanceId())){
                 //购买关联题库商品
-                questionOrderHandle(g.getRelevanceId(),g.getGoodsId(),orderGoods.getOrderGoodsId(),g.getRelevanceSubscribeId());
+                questionOrderHandle(g.getRelevanceId(),g.getGoodsId(),orderGoods.getOrderGoodsId());
             }
             boolean canRepeatBuy = false;
             validUserBeforeBuy(goods, bo.getUserId());
@@ -1570,9 +1567,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             //暂不计算优惠券
             payPrice = payPrice.add(goods.getStandPrice());
             boolean orderGoodsRs = iOrderGoodsService.save(orderGoods);
-            if (ObjectUtils.isNotNull(g.getRelevanceId()) && ObjectUtils.isNotNull(g.getRelevanceSubscribeId())){
+            if (ObjectUtils.isNotNull(g.getRelevanceId())){
                 //购买关联题库商品
-                questionOrderHandle(g.getRelevanceId(),g.getGoodsId(),orderGoods.getOrderGoodsId(),g.getRelevanceSubscribeId());
+                questionOrderHandle(g.getRelevanceId(),g.getGoodsId(),orderGoods.getOrderGoodsId());
             }
             boolean canRepeatBuy = false;
             validUserBeforeBuy(goods, bo.getUserId());

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

@@ -587,7 +587,6 @@ public class WxPayServiceImpl implements IWxPayService {
         rel.setOrderGoodsId(orderGoods.getOrderGoodsId());
         rel.setQuestionGoodsId(questionGoods.getGoodsId());
         rel.setQsOrderGoodsId(add.getOrderGoodsId());
-        rel.setUserSubscribeId(add.getSubscribeId());
         rel.setStatus(1);
         rel.setQuestionDoNum(merchant.getDoNum());
         rel.setCreateTime(DateUtils.getNowTime());
@@ -614,7 +613,6 @@ public class WxPayServiceImpl implements IWxPayService {
         Long dayBefore = DateUtils.getDayBefore(examTime, 8);
         add.setServiceStartTime(dayBefore);
         add.setServiceEndTime(examTime);
-        add.setSubscribeId(subscribe.getSubscribeId());
         return add;
     }