Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev

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

@@ -316,14 +316,6 @@ public class HighDiscountPackageServiceImpl implements HighDiscountPackageServic
                 userRel.setUseEndTime(userEndTime.getTime());
             }
 
-            HighDiscountUserRel highDiscountUserRel = new HighDiscountUserRel();
-            highDiscountUserRel.setDiscountId(actualList.getDiscountId());
-            highDiscountUserRel.setUserId(MapUtils.getLong(map , "userId"));
-            highDiscountUserRel.setAgentId(actualList.getAgentId());
-            highDiscountUserRel.setDiscountAgentCodeId(actualList.getAgentDiscountCodeId());
-            highDiscountUserRel.setStatus(1);
-            highDiscountUserRel.setCreateTime(new Date());
-
             HighDiscountAgentCode discountAgentCode = highDiscountAgentCodeService.getCodeById(actualList.getAgentDiscountCodeId());
 
             // 修改优惠券二维码状态
@@ -331,7 +323,7 @@ public class HighDiscountPackageServiceImpl implements HighDiscountPackageServic
             highDiscountAgentCodeService.updateCode(discountAgentCode);
 
             // 新增优惠券与用户的绑定关系
-            highDiscountUserRelMapper.insert(highDiscountUserRel);
+            highDiscountUserRelMapper.insert(userRel);
 
             // 修改优惠券包实际库存实际优惠券状态
             actualList.setStatus(0);