Merge branch 'dev_yy' into 2.0-dev

* dev_yy: (25 commits)
  提交代理商
  1
  1
  提交实物
  提交代码
  提交代码
  提交代码
  提交抽奖代码
  1
  提交代码
  提交代码
  提交代码
  提交代码
  提交代码
  提交
  1
  1
  修改首页没有积分专区
  提交代码
  修改小程序注册用券
  ...

# Conflicts:
#	hai-cweb/src/main/java/com/cweb/controller/HighTestController.java
#	hai-service/src/main/java/com/hai/common/utils/DateUtil.java
#	hai-service/src/main/java/com/hai/common/utils/RequestUtils.java
#	hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java
#	hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java
#	hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java
#	hai-service/src/main/java/com/hai/entity/HighChildOrder.java
#	hai-service/src/main/java/com/hai/entity/HighChildOrderExample.java
#	hai-service/src/main/java/com/hai/entity/HighOrder.java
#	hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java
#	hai-service/src/main/java/com/hai/service/HighUserService.java
#	hai-service/src/main/java/com/hai/service/OutRechargeOrderService.java
#	hai-service/src/main/java/com/hai/service/impl/BsDistributionUserRelServiceImpl.java
#	hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java
#	hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java

hai-cweb/src/main/java/com/cweb/controller/CmsContentController.java

@@ -35,38 +35,27 @@ public class CmsContentController {
 
     private static Logger log = LoggerFactory.getLogger(CmsContentController.class);
 
-    @Resource
-    private CommonService commonService;
-
     @Resource
     private CmsContentService cmsContentService;
 
     @Resource
     private CmsCategoryService cmsCategoryService;
 
-    @Resource
-    private BsCompanyService bsCompanyService;
-
     @Resource
     private CmsContentConfig cmsContentConfig;
 
     @Resource
     private BsMsgService bsMsgService;
 
-    @Autowired
-    private UserCenter userCenter;
-
     @RequestMapping(value = "/getCmsContent", method = RequestMethod.GET)
     @ApiOperation(value = "查询cms内容")
     @ResponseBody
     public ResponseData getCmsContent(@RequestParam(name = "companyId", required = true) Long companyId,
                                       @RequestParam(name = "platform", required = true) Integer platform,
-                                      @RequestParam(name = "categoryCode", required = true) String categoryCode, HttpServletRequest request) {
+                                      @RequestParam(name = "categoryCode", required = true) String categoryCode) {
         try {
 
-            // 用户
+
-            SessionObject sessionObject = userCenter.getSessionObject(request);
-            HighUserModel userInfoModel = (HighUserModel) sessionObject.getObject();
 
             CmsCategory category = cmsCategoryService.getCategoryByCode(categoryCode);
 
@@ -111,19 +100,12 @@ public class CmsContentController {
                             object.put("jumpType" , cmsContent.get(0).getJumpType());
                             object.put("jumpUrl" , cmsContent.get(0).getJumpUrl());
                         }
-                        Map<String, Object> mapUser = new HashMap<>();
-
-                        mapUser.put("whereCheck" , false);
-                        mapUser.put("msgType" , 1);
-                        mapUser.put("userId" , userInfoModel.getHighUser().getId());
-                        List<BsMsg> listUser = bsMsgService.queryMsgByList(mapUser);
 
                         Map<String, Object> map = new HashMap<>();
 
                         map.put("companyId" , companyId);
                         map.put("msgType" , 2);
                         List<BsMsg> list = bsMsgService.queryMsgByList(map);
-                        list.addAll(listUser);
 
                         for (BsMsg bsMsg : list) {
                             bsMsg.setTimeData( DateUtil.timeDifference(bsMsg.getCreateTime(), new Date() ));

hai-cweb/src/main/java/com/cweb/controller/pay/OrderController.java

@@ -647,119 +647,119 @@ public class OrderController {
     public ResponseData fleetOilCardPay(@RequestBody String reqBodyStr,HttpServletRequest request) {
         try {
             // 用户
-            SessionObject sessionObject = userCenter.getSessionObject(request);
+//            SessionObject sessionObject = userCenter.getSessionObject(request);
-            HighUserModel userInfoModel = (HighUserModel) sessionObject.getObject();
+//            HighUserModel userInfoModel = (HighUserModel) sessionObject.getObject();
-
+//
-            if (StringUtils.isBlank(reqBodyStr)) {
+//            if (StringUtils.isBlank(reqBodyStr)) {
-                log.error("orderToPay error!", "参数错误");
+//                log.error("orderToPay error!", "参数错误");
-                throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
+//                throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
-            }
+//            }
-            JSONObject jsonObject = JSONObject.parseObject(reqBodyStr);
+//            JSONObject jsonObject = JSONObject.parseObject(reqBodyStr);
-            String cardNo = jsonObject.getString("cardNo");
+//            String cardNo = jsonObject.getString("cardNo");
-            Long orderId = jsonObject.getLong("orderId");
+//            Long orderId = jsonObject.getLong("orderId");
-            String password = jsonObject.getString("password");
+//            String password = jsonObject.getString("password");
-            String carLicensePlate = jsonObject.getString("carLicensePlate");
+//            String carLicensePlate = jsonObject.getString("carLicensePlate");
-
+//
-            if (StringUtils.isBlank(cardNo) || orderId == null) {
+//            if (StringUtils.isBlank(cardNo) || orderId == null) {
-                log.error("orderToPay error!", "参数错误");
+//                log.error("orderToPay error!", "参数错误");
-                throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
+//                throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
-            }
+//            }
-            // 查询用户支付密码
+//            // 查询用户支付密码
-            HighUserPayPassword userPayPassword = highUserPayPasswordService.getDetailByUser(userInfoModel.getHighUser().getId());
+//            HighUserPayPassword userPayPassword = highUserPayPasswordService.getDetailByUser(userInfoModel.getHighUser().getId());
-            if (userPayPassword == null) {
+//            if (userPayPassword == null) {
-                log.error("orderToPay error!", "未设置支付密码");
+//                log.error("orderToPay error!", "未设置支付密码");
-                throw ErrorHelp.genException(SysCode.System, ErrorCode.NOT_SET_USER_PAY_PWD, "");
+//                throw ErrorHelp.genException(SysCode.System, ErrorCode.NOT_SET_USER_PAY_PWD, "");
-            }
+//            }
-            if (StringUtils.isBlank(password)) {
+//            if (StringUtils.isBlank(password)) {
-                log.error("orderToPay error!", "未输入支付密码");
+//                log.error("orderToPay error!", "未输入支付密码");
-                throw ErrorHelp.genException(SysCode.System, ErrorCode.NOT_ENTER_USER_PAY_PWD, "");
+//                throw ErrorHelp.genException(SysCode.System, ErrorCode.NOT_ENTER_USER_PAY_PWD, "");
-            }
+//            }
-            // 校验支付密码是否一直
+//            // 校验支付密码是否一直
-            if (!AESEncodeUtil.aesEncrypt(password).equals(userPayPassword.getPassword())) {
+//            if (!AESEncodeUtil.aesEncrypt(password).equals(userPayPassword.getPassword())) {
-                log.error("orderToPay error!", "");
+//                log.error("orderToPay error!", "");
-                throw ErrorHelp.genException(SysCode.System, ErrorCode.USER_PAY_PWD_ERROR, "");
+//                throw ErrorHelp.genException(SysCode.System, ErrorCode.USER_PAY_PWD_ERROR, "");
-            }
+//            }
-
+//
-            // 查询用户与卡号的关系
+//            // 查询用户与卡号的关系
-            HighUserCard userCard = highUserCardService.getDetailByUserCardNo(userInfoModel.getHighUser().getId(), cardNo);
+//            HighUserCard userCard = highUserCardService.getDetailByUserCardNo(userInfoModel.getHighUser().getId(), cardNo);
-            if (userCard == null) {
+//            if (userCard == null) {
-                log.error("OrderController --> orderToPay() ERROR", "未绑定卡号");
+//                log.error("OrderController --> orderToPay() ERROR", "未绑定卡号");
-                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未绑定卡号");
+//                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未绑定卡号");
-            }
+//            }
-            HighOrder order = highOrderService.getOrderById(orderId);
+//            HighOrder order = highOrderService.getOrderById(orderId);
-            if(order == null) {
+//            if(order == null) {
-                log.error("OrderController --> orderToPay() ERROR", "未找到订单信息");
+//                log.error("OrderController --> orderToPay() ERROR", "未找到订单信息");
-                throw ErrorHelp.genException(SysCode.System, ErrorCode.NOT_FOUND_ORDER, "");
+//                throw ErrorHelp.genException(SysCode.System, ErrorCode.NOT_FOUND_ORDER, "");
-            }
+//            }
-            //校验订单状态  订单状态：1 待支付  2 已支付  3.已完成  4. 已退款  5.已取消
+//            //校验订单状态  订单状态：1 待支付  2 已支付  3.已完成  4. 已退款  5.已取消
-            if(order.getOrderStatus() != 1) {
+//            if(order.getOrderStatus() != 1) {
-                log.error("OrderController --> orderToPay() ERROR", "订单不处于待支付状态");
+//                log.error("OrderController --> orderToPay() ERROR", "订单不处于待支付状态");
-                throw ErrorHelp.genException(SysCode.System, ErrorCode.ORDER_NO_STAY_PAY, "");
+//                throw ErrorHelp.genException(SysCode.System, ErrorCode.ORDER_NO_STAY_PAY, "");
-            }
+//            }
-
+//
-            // 商品类型   1:卡卷  2:金币充值
+//            // 商品类型   1:卡卷  2:金币充值
-            for (HighChildOrder childOrder : order.getHighChildOrderList()) {
+//            for (HighChildOrder childOrder : order.getHighChildOrderList()) {
-                if (childOrder.getGoodsType() == 3) {
+//                if (childOrder.getGoodsType() == 3) {
-                    if (highOrderService.getGasTheDayOrderNum(order.getMemId()) >= 1) {
+//                    if (highOrderService.getGasTheDayOrderNum(order.getMemId()) >= 1) {
-                        throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "已达到每日加油次数上限");
+//                        throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "已达到每日加油次数上限");
-                    }
+//                    }
-
+//
-                    // 查询加油站
+//                    // 查询加油站
-                    HighMerchantStoreModel store = merchantStoreService.getMerchantStoreById(childOrder.getGoodsId());
+//                    HighMerchantStoreModel store = merchantStoreService.getMerchantStoreById(childOrder.getGoodsId());
-                    if (store == null) {
+//                    if (store == null) {
-                        throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "已达到每日加油次数上限");
+//                        throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "已达到每日加油次数上限");
-                    }
+//                    }
-                    // 来源类型  1：平台自建   2：团油
+//                    // 来源类型  1：平台自建   2：团油
-                    if (store.getSourceType().equals(2)) {
+//                    if (store.getSourceType().equals(2)) {
-                        // 查询账号余额
+//                        // 查询账号余额
-                        JSONObject accountInfo2JD = TuanYouConfig.queryCompanyAccountInfo2JD();
+//                        JSONObject accountInfo2JD = TuanYouConfig.queryCompanyAccountInfo2JD();
-                        JSONArray result = accountInfo2JD.getJSONArray("result");
+//                        JSONArray result = accountInfo2JD.getJSONArray("result");
-                        for (Object accountObject : result) {
+//                        for (Object accountObject : result) {
-                            JSONObject account = (JSONObject)accountObject;
+//                            JSONObject account = (JSONObject)accountObject;
-                            // 1:汽油:2:柴油;3:天然气
+//                            // 1:汽油:2:柴油;3:天然气
-                            if (account.getInteger("energyType") == childOrder.getGasOilType()) {
+//                            if (account.getInteger("energyType") == childOrder.getGasOilType()) {
-                                // 支付金额 大于 团油账号余额
+//                                // 支付金额 大于 团油账号余额
-                                if(order.getPayPrice().compareTo(account.getBigDecimal("accountBalance")) == 1){
+//                                if(order.getPayPrice().compareTo(account.getBigDecimal("accountBalance")) == 1){
-                                    log.error("OrderController --> orderToPay() ERROR", "无法进行支付，请联系平台客服");
+//                                    log.error("OrderController --> orderToPay() ERROR", "无法进行支付，请联系平台客服");
-                                    throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "无法进行支付，请联系平台客服");
+//                                    throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "无法进行支付，请联系平台客服");
-                                }
+//                                }
-                            }
+//                            }
-                        }
+//                        }
-                    }
+//                    }
-                    // 来源类型  1：平台自建   2：团油
+//                    // 来源类型  1：平台自建   2：团油
-                    if (store.getSourceType().equals(MerchantStoreSourceType.type3.getNumber())) {
+//                    if (store.getSourceType().equals(MerchantStoreSourceType.type3.getNumber())) {
-                        BigDecimal account = new BigDecimal("0");
+//                        BigDecimal account = new BigDecimal("0");
-                        // 查询账号余额
+//                        // 查询账号余额
-                        HighMerchantAccount merAccount = merchantAccountService.getMerAccountDetail(store.getMerchantId());
+//                        HighMerchantAccount merAccount = merchantAccountService.getMerAccountDetail(store.getMerchantId());
-                        if (merAccount != null) {
+//                        if (merAccount != null) {
-                            account = merAccount.getAmounts().subtract(merchantAccountService.countMerGasOilAmount(store.getMerchantId()));
+//                            account = merAccount.getAmounts().subtract(merchantAccountService.countMerGasOilAmount(store.getMerchantId()));
-                        }
+//                        }
-                        // 客户加油金额 大于 商户账号余额
+//                        // 客户加油金额 大于 商户账号余额
-                        if(order.getTotalPrice().compareTo(account) == 1) {
+//                        if(order.getTotalPrice().compareTo(account) == 1) {
-                            log.error("OrderController --> orderToPay() ERROR", "暂时无法进行支付，请联系平台客服");
+//                            log.error("OrderController --> orderToPay() ERROR", "暂时无法进行支付，请联系平台客服");
-                            throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "暂时无法进行支付，请联系平台客服");
+//                            throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "暂时无法进行支付，请联系平台客服");
-                        }
+//                        }
-                    }
+//                    }
-                }
+//                }
-            }
+//            }
-
+//
-            highOrderService.fleetOilCardPayOrder(userCard.getId(), order.getId(), carLicensePlate);
+//            highOrderService.fleetOilCardPayOrder(userCard.getId(), order.getId(), carLicensePlate);
-
+//
-            new Thread(() -> {
+//            new Thread(() -> {
-                // 查询订单信息
+//                // 查询订单信息
-                if (order == null) {
+//                if (order == null) {
-                    throw ErrorHelp.genException(SysCode.System, ErrorCode.NOT_FOUND_ORDER, "");
+//                    throw ErrorHelp.genException(SysCode.System, ErrorCode.NOT_FOUND_ORDER, "");
-                }
+//                }
-                HighUser highUser = highUserService.findByUserId(order.getMemId());
+//                HighUser highUser = highUserService.findByUserId(order.getMemId());
-                HighChildOrder presentation = highOrderService.getChildOrderByPresentation(order.getId());
+//                HighChildOrder presentation = highOrderService.getChildOrderByPresentation(order.getId());
-                WxMsgConfig.pushOneUser(
+//                WxMsgConfig.pushOneUser(
-                        presentation.getGoodsName() + "(" + GoodsType.getNameByType(presentation.getGoodsType()) + ")",
+//                        presentation.getGoodsName() + "(" + GoodsType.getNameByType(presentation.getGoodsType()) + ")",
-                        String.valueOf(order.getPayPrice()),
+//                        String.valueOf(order.getPayPrice()),
-                        order.getOrderNo(),
+//                        order.getOrderNo(),
-                        order.getPayTime(),
+//                        order.getPayTime(),
-                        PayType.getNameByType(order.getPayType()), order.getId(),
+//                        PayType.getNameByType(order.getPayType()), order.getId(),
-                        highUser.getOpenId());
+//                        highUser.getOpenId());
-            }).start();
+//            }).start();
 
             return ResponseMsgUtil.success("支付成功");
         } catch (Exception e) {

hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java

@@ -142,6 +142,7 @@ public interface HighOrderMapperExt {
             " (select mer.merchant_name from high_merchant mer where EXISTS (select 1 from high_coupon cou where cou.id = a.goods_id and mer.id = cou.merchant_id)) merchantName," +
             " case a.goods_type when 1 then '卡券' when 2 then '金币充值' when 3 then '加油缴费' end goodsType, " +
             " a.goods_name goodsName, " +
+            " b.id orderId, " +
             " a.goods_type goodsTypeId," +
             " case a.giveaway_type when 1 then '赠送' when 0 then '购买' end giveawayType," +
             " b.order_no orderNo," +
@@ -1119,29 +1120,33 @@ public interface HighOrderMapperExt {
 
 
     @Select({" select" +
-            " case when SUM(gas_refuel_price) is null then 0 else SUM(gas_refuel_price) end price," +
+            " case when SUM(b.total_price) is null then 0 else SUM(b.total_price) end price," +
             " count(1) count" +
-            " from high_gas_order where store_id = #{storeId} and status in (${status}) " +
+            " from high_child_order a,high_order b " +
+            " where a.order_id = b.id and goods_type = 3 and goods_id = #{storeId} and b.order_status in (${status}) " +
             " and to_days(pay_time) = to_days(now())"})
     Map<String, Object> selectGasTheDayOrderCount(@Param("storeId") Long storeId, @Param("status") String status);
 
     @Select({" select" +
-            " case when SUM(a.gas_refuel_price) is null then 0 else SUM(a.gas_refuel_price) end price," +
+            " case when SUM(b.total_price) is null then 0 else SUM(b.total_price) end price," +
             " count(1) count" +
-            " from high_gas_order a where a.gas_staff_id = #{gasStaffId} and a.status in (${status}) " +
+            " from high_child_order a,high_order b " +
+            " where a.order_id = b.id and goods_type = 3 and gas_staff_id = #{gasStaffId} and b.order_status in (${status}) " +
             " and to_days(pay_time) = to_days(now())"})
     Map<String, Object> selectGasStaffTheDayOrderCount(@Param("gasStaffId") Long gasStaffId, @Param("status") String status);
 
     @Select({" select" +
-            " case when SUM(a.gas_refuel_price) is null then 0 else SUM(a.gas_refuel_price) end price," +
+            " case when SUM(b.total_price) is null then 0 else SUM(b.total_price) end price," +
             " count(1) count" +
-            " from high_gas_order a where store_id = #{storeId} and a.status in (${status}) "})
+            " from high_child_order a,high_order b " +
+            " where a.order_id = b.id and goods_type = 3 and goods_id = #{storeId} and b.order_status in (${status}) "})
     Map<String, Object> selectGasHistoryOrderCount(@Param("storeId") Long storeId, @Param("status") String status);
 
     @Select({" select" +
-            " case when SUM(a.total_price) is null then 0 else SUM(a.total_price) end price," +
+            " case when SUM(b.total_price) is null then 0 else SUM(b.total_price) end price," +
             " count(1) count" +
-            " from high_gas_order a where a.gas_staff_id = #{gasStaffId} and a.status in (${status}) "})
+            " from high_child_order a,high_order b " +
+            " where a.order_id = b.id and goods_type = 3 and gas_staff_id = #{gasStaffId} and b.order_status in (${status}) "})
     Map<String, Object> selectGasStaffHistoryOrderCount(@Param("gasStaffId") Long gasStaffId, @Param("status") String status);
 
     @Select({
@@ -1281,4 +1286,32 @@ public interface HighOrderMapperExt {
     })
     List<HighOrder> integralRebateOrder();
 
+    @Select({"<script>" +
+            "SELECT" +
+            " ho.id as orderId ," +
+            " aor.order_no as orderNo ," +
+            " source_order_no as sourceOrderNo ," +
+            " ho.total_price as orderPrice ," +
+            " ho.pay_price as payPrice ," +
+            " ho.order_status as orderStatus ," +
+            " aor.status as callbackStatus ," +
+            " ho.create_time as createTime ," +
+            " ho.pay_time as payTime" +
+            " from high_order ho join api_order_record  aor on ho.id = aor.order_id " +
+            " where 1 = 1 " +
+            "<if test='map.merchId != null'> and merch_id = #{map.merchId} </if>",
+            "<if test='map.orderNo != null'> and aor.order_no = #{map.orderNo} </if>",
+            "<if test='map.sourceOrderNo != null'> and aor.source_order_no = #{map.sourceOrderNo} </if>",
+            "<if test='map.orderStatus != null'> and order_status = #{map.orderStatus} </if>",
+            "<if test='map.productType != null'> and ho.product_type = #{map.productType} </if>",
+            "<if test='map.callbackStatus != null'> and aor.status = #{map.callbackStatus} </if>",
+            "<if test='map.createTimeS != null'> <![CDATA[ and ho.create_time >= #{map.createTimeS} ]]> </if>",
+            "<if test='map.createTimeE != null'> <![CDATA[ and ho.create_time <= #{map.createTimeE} ]]> </if>",
+            "<if test='map.payTimeS != null'> <![CDATA[ and ho.pay_time >= #{map.payTimeS} ]]> </if>",
+            "<if test='map.payTimeE != null'> <![CDATA[ and ho.pay_time <= #{map.payTimeE} ]]> </if>",
+            " ORDER BY ho.create_time DESC" +
+                    "</script>"
+    })
+    List<ApiThirdOrderModel> getApiThirdOrderByList(@Param("map") Map<String,Object> map);
+
 }

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

@@ -205,7 +205,7 @@ public class HighFleetOilCardServiceImpl implements HighFleetOilCardService {
     @Override
     @Transactional(propagation = Propagation.REQUIRES_NEW)
     public void consume(String fleetCardNo,String contactPhone, BigDecimal amount, Map<String, Object> otherParam) {
-        // 获取锁
+        // 获取锁 todo api扣款需要
         Boolean lock = redisTemplate.opsForValue().setIfAbsent(LOCK_KEY+fleetCardNo, "");
         if (!lock) {
             try {
@@ -287,7 +287,7 @@ public class HighFleetOilCardServiceImpl implements HighFleetOilCardService {
         if (order.getOrderStatus() == 2 || order.getOrderStatus() == 3 || order.getOrderStatus() == 6 || order.getOrderStatus() == 7) {
             order.setOrderStatus(4);
             order.setRefundTime(new Date());
-            order.setRefundPrice(order.getPayRealPrice());
+//            order.setRefundPrice(order.getPayRealPrice());
             orderService.updateOrderDetail(order);
 
             // 变更前金额

hai-user/target/maven-archiver/pom.properties

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 #Created by Apache Maven 3.8.2
-=======
-#Created by Apache Maven 3.6.3
->>>>>>> activit
 version=1.0-SNAPSHOT
 groupId=com.hsg
 artifactId=hai-user

hai-user/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 com/web/config/ConfigListener.class
 com/web/config/SysConfig.class
 com/web/type/LoginType.class
@@ -18,25 +17,3 @@ com/web/controller/LoginLogController.class
 com/web/config/MultipartConfig.class
 com/web/config/SwaggerConfig.class
 com/web/config/AuthConfig.class
-=======
-com\web\controller\UserController.class
-com\web\config\SentinelFilterConfig.class
-com\web\controller\LoginController.class
-com\web\type\LoginType.class
-com\web\config\WxMaConfiguration.class
-com\web\controller\DiscountController.class
-com\web\config\MultipartConfig.class
-com\web\config\SysConst.class
-com\web\config\AuthConfig.class
-com\web\config\SysConfig.class
-com\web\controller\LoginLogController.class
-com\UserApplication.class
-com\web\config\RedisConfig.class
-com\web\config\AuthConfig$1.class
-com\web\controller\WechatController.class
-com\web\config\ConfigListener.class
-com\web\config\SwaggerConfig.class
-com\web\config\CorsConfig.class
-com\web\controller\TestController.class
-com\web\controller\SmsController.class
->>>>>>> activit

hai-user/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 /Volumes/work/code/high-work/high-service/hai-user/src/main/java/com/web/config/RedisConfig.java
 /Volumes/work/code/high-work/high-service/hai-user/src/main/java/com/web/controller/LoginController.java
 /Volumes/work/code/high-work/high-service/hai-user/src/main/java/com/web/config/WxMaConfiguration.java
@@ -17,24 +16,3 @@
 /Volumes/work/code/high-work/high-service/hai-user/src/main/java/com/web/config/CorsConfig.java
 /Volumes/work/code/high-work/high-service/hai-user/src/main/java/com/web/config/SysConfig.java
 /Volumes/work/code/high-work/high-service/hai-user/src/main/java/com/web/controller/DiscountController.java
-=======
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\controller\WechatController.java
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\controller\SmsController.java
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\config\MultipartConfig.java
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\config\AuthConfig.java
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\config\SysConst.java
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\controller\LoginController.java
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\config\ConfigListener.java
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\controller\LoginLogController.java
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\config\SysConfig.java
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\config\RedisConfig.java
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\config\CorsConfig.java
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\config\SentinelFilterConfig.java
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\controller\UserController.java
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\controller\TestController.java
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\type\LoginType.java
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\config\SwaggerConfig.java
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\UserApplication.java
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\config\WxMaConfiguration.java
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\controller\DiscountController.java
->>>>>>> activit