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

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

@@ -2,7 +2,6 @@ package com.bweb.controller;
 
 import com.hai.common.utils.ResponseMsgUtil;
 import com.hai.entity.SecConfig;
-import com.hai.entity.SecDictionary;
 import com.hai.model.ResponseData;
 import com.hai.service.CommonService;
 import com.hai.service.SecConfigService;

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

@@ -8,12 +8,8 @@ import com.hai.common.exception.ErrorHelp;
 import com.hai.common.exception.SysCode;
 import com.hai.common.security.SessionObject;
 import com.hai.common.security.UserCenter;
-import com.hai.common.utils.DateUtil;
-import com.hai.common.utils.IDGenerator;
-import com.hai.common.utils.MemberValidateUtil;
 import com.hai.common.utils.ResponseMsgUtil;
 import com.hai.entity.HighAgent;
-import com.hai.entity.HighUser;
 import com.hai.entity.SecUser;
 import com.hai.model.HighAgentModel;
 import com.hai.model.ResponseData;
@@ -32,7 +28,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;

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

@@ -8,21 +8,15 @@ import com.hai.common.exception.ErrorHelp;
 import com.hai.common.exception.SysCode;
 import com.hai.common.security.SessionObject;
 import com.hai.common.security.UserCenter;
-import com.hai.common.utils.DateUtil;
 import com.hai.common.utils.ResponseMsgUtil;
 import com.hai.entity.HighApprove;
-import com.hai.entity.HighCoupon;
-import com.hai.entity.HighCouponHandsel;
-import com.hai.entity.HighMerchant;
 import com.hai.enum_type.ApproveType;
-import com.hai.model.HighCouponModel;
 import com.hai.model.ResponseData;
 import com.hai.model.UserInfoModel;
 import com.hai.service.HighApproveService;
 import com.hai.service.HighCouponService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,7 +1,6 @@
 package com.bweb.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.hai.common.exception.ErrorCode;
@@ -12,14 +11,11 @@ import com.hai.common.security.UserCenter;
 import com.hai.common.utils.DateUtil;
 import com.hai.common.utils.ResponseMsgUtil;
 import com.hai.entity.*;
-import com.hai.model.HighAgentModel;
-import com.hai.model.HighMerchantModel;
 import com.hai.model.ResponseData;
 import com.hai.model.UserInfoModel;
 import com.hai.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +26,6 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * @Auther: 胡锐

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

@@ -9,7 +9,6 @@ import com.hai.common.exception.SysCode;
 import com.hai.common.security.SessionObject;
 import com.hai.common.security.UserCenter;
 import com.hai.common.utils.ResponseMsgUtil;
-import com.hai.entity.HighCouponCode;
 import com.hai.model.ResponseData;
 import com.hai.model.UserInfoModel;
 import com.hai.service.HighCouponCodeService;
@@ -23,7 +22,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 

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

@@ -1,6 +1,5 @@
 package com.bweb.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.hai.common.exception.ErrorCode;

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

@@ -8,7 +8,6 @@ import com.hai.common.utils.ResponseMsgUtil;
 import com.hai.entity.HighCoupon;
 import com.hai.entity.HighDiscountCouponRel;
 import com.hai.model.ResponseData;
-import com.hai.service.HighAgentService;
 import com.hai.service.HighCouponService;
 import com.hai.service.HighDiscountCouponRelService;
 import io.swagger.annotations.Api;

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

@@ -6,8 +6,6 @@ import com.github.pagehelper.PageInfo;
 import com.hai.common.exception.ErrorCode;
 import com.hai.common.exception.ErrorHelp;
 import com.hai.common.exception.SysCode;
-import com.hai.common.utils.CoordCommonUtil;
-import com.hai.common.utils.PageUtil;
 import com.hai.common.utils.ResponseMsgUtil;
 import com.hai.entity.HighGasDiscountOilPrice;
 import com.hai.model.ResponseData;
@@ -23,7 +21,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.*;
-import java.util.stream.Collectors;
 
 @Controller
 @RequestMapping(value = "/highGasDiscountOilPrice")

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

@@ -2,10 +2,8 @@ package com.bweb.controller;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.hai.common.security.SessionObject;
 import com.hai.common.security.UserCenter;
 import com.hai.common.utils.ResponseMsgUtil;
-import com.hai.model.HighUserModel;
 import com.hai.model.ResponseData;
 import com.hai.service.HighGoldRecService;
 import io.swagger.annotations.Api;
@@ -20,7 +18,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.Map;
 

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

@@ -8,18 +8,14 @@ import com.hai.common.exception.ErrorHelp;
 import com.hai.common.exception.SysCode;
 import com.hai.common.security.SessionObject;
 import com.hai.common.security.UserCenter;
-import com.hai.common.utils.DateUtil;
 import com.hai.common.utils.ResponseMsgUtil;
 import com.hai.entity.*;
-import com.hai.model.HighCouponModel;
 import com.hai.model.ResponseData;
 import com.hai.model.UserInfoModel;
-import com.hai.service.HighApproveService;
 import com.hai.service.HighCouponService;
 import com.hai.service.HighGoodsPriceReferService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,21 +1,16 @@
 package com.bweb.controller;
 
-import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.hai.common.exception.ErrorCode;
 import com.hai.common.exception.ErrorHelp;
 import com.hai.common.exception.SysCode;
-import com.hai.common.security.AESEncodeUtil;
 import com.hai.common.security.SessionObject;
 import com.hai.common.security.UserCenter;
 import com.hai.common.utils.DateUtil;
-import com.hai.common.utils.MD5Util;
 import com.hai.common.utils.MemberValidateUtil;
 import com.hai.common.utils.ResponseMsgUtil;
-import com.hai.entity.*;
 import com.hai.model.HighMerchantModel;
-import com.hai.model.MenuTreeModel;
 import com.hai.model.ResponseData;
 import com.hai.model.UserInfoModel;
 import com.hai.service.HighMerchantService;
@@ -31,10 +26,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**

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

@@ -1,10 +1,7 @@
 package com.bweb.controller;
 
 import com.alibaba.excel.EasyExcel;
-import com.alibaba.fastjson.JSON;
-import com.bweb.excelListener.ImportCouponListener;
 import com.bweb.excelListener.ImportStoreListener;
-import com.bweb.model.ImportCouponModel;
 import com.bweb.model.ImportStoreModel;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -13,7 +10,6 @@ import com.hai.common.exception.ErrorHelp;
 import com.hai.common.exception.SysCode;
 import com.hai.common.security.SessionObject;
 import com.hai.common.security.UserCenter;
-import com.hai.common.utils.MemberValidateUtil;
 import com.hai.common.utils.ResponseMsgUtil;
 import com.hai.entity.HighMerchant;
 import com.hai.entity.HighMerchantStore;
@@ -37,7 +33,6 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**

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

@@ -12,11 +12,9 @@ import com.hai.common.security.SessionObject;
 import com.hai.common.security.UserCenter;
 import com.hai.common.utils.ResponseMsgUtil;
 import com.hai.model.HighOrderModel;
-import com.hai.model.HighUserModel;
 import com.hai.model.ResponseData;
 import com.hai.model.UserInfoModel;
 import com.hai.service.HighCouponCodeService;
-import com.hai.service.HighCouponService;
 import com.hai.service.HighOrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -5,7 +5,6 @@ import com.github.pagehelper.PageInfo;
 import com.hai.common.exception.ErrorCode;
 import com.hai.common.exception.ErrorHelp;
 import com.hai.common.exception.SysCode;
-import com.hai.common.utils.DateUtil;
 import com.hai.common.utils.ResponseMsgUtil;
 import com.hai.entity.HighUser;
 import com.hai.model.ResponseData;
@@ -15,13 +14,10 @@ import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

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

@@ -27,7 +27,6 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
-import java.util.Objects;
 
 @Controller
 @RequestMapping(value = "/login")

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

@@ -1,9 +1,7 @@
 package com.bweb.controller;
 
 import com.alibaba.excel.EasyExcel;
-import com.alibaba.fastjson.JSONObject;
 import com.bweb.config.SysConst;
-import com.bweb.model.ExportHighOrderModel;
 import com.bweb.model.ExportOutRechargeOrder;
 import com.bweb.model.ExportOutRechargeOrderCount;
 import com.bweb.model.ExportOutRechargeUserOrderCount;
@@ -14,16 +12,11 @@ import com.hai.common.exception.ErrorHelp;
 import com.hai.common.exception.SysCode;
 import com.hai.common.pay.util.XmlUtil;
 import com.hai.common.pay.util.sdk.WXPayConstants;
-import com.hai.common.security.SessionObject;
-import com.hai.common.security.UserCenter;
-import com.hai.common.utils.DateUtil;
-import com.hai.common.utils.IDGenerator;
 import com.hai.common.utils.ResponseMsgUtil;
 import com.hai.common.utils.WxUtils;
 import com.hai.entity.OutRechargeOrder;
 import com.hai.model.*;
 import com.hai.service.OutRechargeOrderService;
-import com.hai.service.TelApiService;
 import com.hai.service.pay.impl.GoodsOrderServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -36,13 +29,11 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.util.EntityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.io.File;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.Date;

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

@@ -5,22 +5,15 @@ import com.github.pagehelper.PageInfo;
 import com.hai.common.exception.ErrorCode;
 import com.hai.common.exception.ErrorHelp;
 import com.hai.common.exception.SysCode;
-import com.hai.common.security.SessionObject;
 import com.hai.common.security.UserCenter;
 import com.hai.common.utils.ResponseMsgUtil;
-import com.hai.entity.HighAgent;
 import com.hai.entity.OutRechargePrice;
-import com.hai.entity.SecUser;
-import com.hai.model.HighAgentModel;
 import com.hai.model.ResponseData;
-import com.hai.model.UserInfoModel;
 import com.hai.service.OutRechargePriceService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;

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

@@ -6,19 +6,16 @@ import com.hai.common.exception.ErrorCode;
 import com.hai.common.exception.ErrorHelp;
 import com.hai.common.exception.SysCode;
 import com.hai.common.utils.ResponseMsgUtil;
-import com.hai.entity.HighUser;
 import com.hai.entity.SecSinopecConfig;
 import com.hai.model.ResponseData;
 import com.hai.service.SecSinopecConfigService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;

hai-bweb/src/main/java/com/bweb/excelListener/ImportCouponListener.java

@@ -2,7 +2,6 @@ package com.bweb.excelListener;
 
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
-import com.alibaba.fastjson.JSON;
 import com.bweb.model.ImportCouponModel;
 import com.hai.common.utils.DateUtil;
 import com.hai.entity.HighCoupon;
@@ -10,10 +9,7 @@ import com.hai.entity.HighCouponCode;
 import com.hai.model.UserInfoModel;
 import com.hai.service.HighCouponCodeService;
 import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 

hai-bweb/src/main/java/com/bweb/excelListener/ImportStoreListener.java

@@ -2,15 +2,11 @@ package com.bweb.excelListener;
 
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
-import com.bweb.model.ImportCouponModel;
 import com.bweb.model.ImportStoreModel;
-import com.hai.common.utils.DateUtil;
-import com.hai.common.utils.MemberValidateUtil;
 import com.hai.entity.*;
 import com.hai.model.HighMerchantStoreModel;
 import com.hai.model.UserInfoModel;
 import com.hai.service.CommonService;
-import com.hai.service.HighCouponCodeService;
 import com.hai.service.HighMerchantStoreService;
 import org.apache.commons.lang3.StringUtils;
 

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

@@ -113,10 +113,6 @@ public class GoodsOrderServiceImpl implements PayService {
                     // 商品类型   商品类型   1:卡卷   2:金币充值
                     if (highChildOrder.getGoodsType() == 1) {
                         highChildOrder.setChildOrdeStatus(2);  // 子订单状态：1 待支付  2 已支付  3.已完成  4. 已退款  5.已取消
-                        HighCouponCode code = highCouponCodeService.getCouponCodeByOrderId(highChildOrder.getId());
-                        code.setStatus(2);  // 状态：1.待销售 2.未使用 3.已使用  99.预支付
-                        code.setReceiveTime(new Date());
-                        highCouponCodeService.updateCouponCode(code);
 
                         HighCoupon coupon = highCouponService.getCouponById(highChildOrder.getGoodsId());
                         // 贵州中石化
@@ -127,8 +123,6 @@ public class GoodsOrderServiceImpl implements PayService {
                                 log.error("HighCouponController -> insertCoupon() error!","获取token失败");
                                 throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "获取token失败");
                             }
-
-
                             Map<String,Object> push = new HashMap<>();
                             push.put("token", tokenObject.getString("data"));
                             push.put("couTypeCode", coupon.getCouponKey());
@@ -177,6 +171,10 @@ public class GoodsOrderServiceImpl implements PayService {
                             highGasOrderPushMapper.insert(highGasOrderPush);
 
                         } else {
+                            HighCouponCode code = highCouponCodeService.getCouponCodeByOrderId(highChildOrder.getId());
+                            code.setStatus(2);  // 状态：1.待销售 2.未使用 3.已使用  99.预支付
+                            code.setReceiveTime(new Date());
+                            highCouponCodeService.updateCouponCode(code);
                             // 卡卷关联用户
                             HighUserCoupon highUserCoupon = new HighUserCoupon();
                             highUserCoupon.setMerchantId(code.getMerchantId());