Merge branch 'dev' of http://139.159.177.244:3000/hurui/hai-server into dev

hai-bweb/src/main/java/com/bweb/controller/HighCouponAgentController.java

@@ -60,12 +60,31 @@ public class HighCouponAgentController {
     @Resource
     private HighCouponService highCouponService;
 
+
+    @RequestMapping(value = "/getAgentCount", method = RequestMethod.GET)
+    @ResponseBody
+    @ApiOperation(value = "根据销售码查询详情")
+    public ResponseData getAgentCount(HttpServletRequest request) {
+        try {
+            SessionObject sessionObject = userCenter.getSessionObject(request);
+            UserInfoModel userInfoModel = (UserInfoModel) sessionObject.getObject();
+
+            Map<String,Object> map = new HashMap<>();
+            map.put("", "");
+
+            return ResponseMsgUtil.success(map);
+
+        } catch (Exception e) {
+            log.error("HighCouponAgentController --> getCodeById() error!", e);
+            return ResponseMsgUtil.exception(e);
+        }
+    }
+
     @RequestMapping(value = "/assignCouponAgent", method = RequestMethod.POST)
     @ResponseBody
     @ApiOperation(value = "分配卡券给代理商")
     public ResponseData assignCouponAgent(@RequestBody HighCouponAgentRel highCouponAgentRel, HttpServletRequest request) {
         try {
-            //发布人员
             SessionObject sessionObject = userCenter.getSessionObject(request);
             UserInfoModel userInfoModel = (UserInfoModel) sessionObject.getObject();
             if (userInfoModel.getBsCompany() == null) {

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

@@ -48,6 +48,7 @@ public class HighCouponAgentServiceImpl implements HighCouponAgentService {
         Map<String,Object> map = new HashMap<>();
         map.put("couponId", highCouponAgentRel.getCouponId());
         map.put("status", 1);
+        map.put("salesEndTimeS", new Date().getTime());
         map.put("isAssignAgent", false);
         List<HighCouponCode> codeList = highCouponCodeService.getCouponCodeList(map);
 

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

@@ -183,7 +183,7 @@ public class HighCouponCodeServiceImpl implements HighCouponCodeService {
     @Override
     public Integer getStockCountByCoupon(Long couponId) {
         HighCouponCodeExample example = new HighCouponCodeExample();
-        example.createCriteria().andCouponIdEqualTo(couponId).andStatusEqualTo(1).andSalesEndTimeGreaterThan(new Date());
+        example.createCriteria().andCouponIdEqualTo(couponId).andStatusEqualTo(1).andSalesEndTimeGreaterThan(new Date()).andIsAssignAgentEqualTo(false);
         return highCouponCodeMapper.selectByExample(example).size();
     }
 
@@ -211,6 +211,10 @@ public class HighCouponCodeServiceImpl implements HighCouponCodeService {
             criteria.andSalesCodeLike("%" + MapUtils.getString(map, "salesCode") + "%");
         }
 
+        if (MapUtils.getLong(map, "salesEndTimeS") != null) {
+            criteria.andSalesEndTimeGreaterThan(new Date(MapUtils.getLong(map, "salesEndTimeS")));
+        }
+
         if (MapUtils.getBoolean(map, "isAssignAgent") != null) {
             criteria.andIsAssignAgentEqualTo(MapUtils.getBoolean(map, "isAssignAgent"));
         }