提交代码

hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java

@@ -85,6 +85,12 @@ public class HighOrderServiceImpl implements HighOrderService {
     @Resource
     private HighOrderService highOrderService;
 
+    @Resource
+    private HighActivityInfoService highActivityInfoService;
+
+    @Resource
+    private HighActivityUserLotteryNumService highActivityUserLotteryNumService;
+
     @Override
     @Transactional(propagation= Propagation.REQUIRES_NEW)
     public void insertOrder(HighOrder highOrder) throws Exception {
@@ -275,6 +281,12 @@ public class HighOrderServiceImpl implements HighOrderService {
                     highUserCoupon.setStatus(1);  // 状态  0:已过期  1：未使用  2：已使用
                     highUserCouponMapper.insert(highUserCoupon);
                 }
+
+                // 查询卡券是否有活动
+                Map<String, Object> activity = highActivityInfoService.getNewActivityByCouponId(coupon.getId());
+                if (activity != null && MapUtils.getLong(activity, "id") != null) {
+                    highActivityUserLotteryNumService.addLotteryNum(MapUtils.getLong(activity, "id"),highOrder.getMemId(), 1);
+                }
             }
         }
 
@@ -429,6 +441,12 @@ public class HighOrderServiceImpl implements HighOrderService {
                     highUserCoupon.setStatus(1);  // 状态  0:已过期  1：未使用  2：已使用
                     highUserCouponMapper.insert(highUserCoupon);
                 }
+
+                // 查询卡券是否有活动
+                Map<String, Object> activity = highActivityInfoService.getNewActivityByCouponId(coupon.getId());
+                if (activity != null && MapUtils.getLong(activity, "id") != null) {
+                    highActivityUserLotteryNumService.addLotteryNum(MapUtils.getLong(activity, "id"),order.getMemId(), 1);
+                }
             }
 
             if (highChildOrder.getGoodsType() == 2) {

hai-service/src/main/java/com/hai/service/pay/impl/GoodsOrderServiceImpl.java

@@ -22,6 +22,7 @@ import com.hai.model.ResultProfitSharing;
 import com.hai.service.*;
 import com.hai.service.pay.NotifyService;
 import com.hai.service.pay.PayService;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
@@ -81,6 +82,12 @@ public class GoodsOrderServiceImpl implements PayService {
     @Resource
     private HighCouponCodeOtherMapper highCouponCodeOtherMapper;
 
+    @Resource
+    private HighActivityInfoService highActivityInfoService;
+
+    @Resource
+    private HighActivityUserLotteryNumService highActivityUserLotteryNumService;
+
     @Resource
     private NotifyService notifyService;
 
@@ -199,6 +206,12 @@ public class GoodsOrderServiceImpl implements PayService {
                             highUserCoupon.setStatus(1);  // 状态  0:已过期  1：未使用  2：已使用
                             highUserCouponMapper.insert(highUserCoupon);
                         }
+
+                        // 查询卡券是否有活动
+                        Map<String, Object> activity = highActivityInfoService.getNewActivityByCouponId(coupon.getId());
+                        if (activity != null && MapUtils.getLong(activity, "id") != null) {
+                            highActivityUserLotteryNumService.addLotteryNum(MapUtils.getLong(activity, "id"),order.getMemId(), 1);
+                        }
                     }
 
                     if (highChildOrder.getGoodsType() == 2) {