diff --git a/hai-cweb/src/main/java/com/cweb/controller/CmsContentController.java b/hai-cweb/src/main/java/com/cweb/controller/CmsContentController.java index 4f7a63aa..1310e3c2 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/CmsContentController.java +++ b/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 mapUser = new HashMap<>(); - - mapUser.put("whereCheck" , false); - mapUser.put("msgType" , 1); - mapUser.put("userId" , userInfoModel.getHighUser().getId()); - List listUser = bsMsgService.queryMsgByList(mapUser); Map map = new HashMap<>(); map.put("companyId" , companyId); map.put("msgType" , 2); List list = bsMsgService.queryMsgByList(map); - list.addAll(listUser); for (BsMsg bsMsg : list) { bsMsg.setTimeData( DateUtil.timeDifference(bsMsg.getCreateTime(), new Date() )); diff --git a/hai-cweb/src/main/java/com/cweb/controller/pay/OrderController.java b/hai-cweb/src/main/java/com/cweb/controller/pay/OrderController.java index e8ff9ad9..0b85bbcf 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/pay/OrderController.java +++ b/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); - HighUserModel userInfoModel = (HighUserModel) sessionObject.getObject(); - - if (StringUtils.isBlank(reqBodyStr)) { - log.error("orderToPay error!", "参数错误"); - throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); - } - JSONObject jsonObject = JSONObject.parseObject(reqBodyStr); - String cardNo = jsonObject.getString("cardNo"); - Long orderId = jsonObject.getLong("orderId"); - String password = jsonObject.getString("password"); - String carLicensePlate = jsonObject.getString("carLicensePlate"); - - if (StringUtils.isBlank(cardNo) || orderId == null) { - log.error("orderToPay error!", "参数错误"); - throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); - } - // 查询用户支付密码 - HighUserPayPassword userPayPassword = highUserPayPasswordService.getDetailByUser(userInfoModel.getHighUser().getId()); - if (userPayPassword == null) { - log.error("orderToPay error!", "未设置支付密码"); - throw ErrorHelp.genException(SysCode.System, ErrorCode.NOT_SET_USER_PAY_PWD, ""); - } - if (StringUtils.isBlank(password)) { - log.error("orderToPay error!", "未输入支付密码"); - throw ErrorHelp.genException(SysCode.System, ErrorCode.NOT_ENTER_USER_PAY_PWD, ""); - } - // 校验支付密码是否一直 - if (!AESEncodeUtil.aesEncrypt(password).equals(userPayPassword.getPassword())) { - log.error("orderToPay error!", ""); - throw ErrorHelp.genException(SysCode.System, ErrorCode.USER_PAY_PWD_ERROR, ""); - } - - // 查询用户与卡号的关系 - HighUserCard userCard = highUserCardService.getDetailByUserCardNo(userInfoModel.getHighUser().getId(), cardNo); - if (userCard == null) { - log.error("OrderController --> orderToPay() ERROR", "未绑定卡号"); - throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未绑定卡号"); - } - HighOrder order = highOrderService.getOrderById(orderId); - if(order == null) { - log.error("OrderController --> orderToPay() ERROR", "未找到订单信息"); - throw ErrorHelp.genException(SysCode.System, ErrorCode.NOT_FOUND_ORDER, ""); - } - //校验订单状态 订单状态：1 待支付 2 已支付 3.已完成 4. 已退款 5.已取消 - if(order.getOrderStatus() != 1) { - log.error("OrderController --> orderToPay() ERROR", "订单不处于待支付状态"); - throw ErrorHelp.genException(SysCode.System, ErrorCode.ORDER_NO_STAY_PAY, ""); - } - - // 商品类型 1:卡卷 2:金币充值 - for (HighChildOrder childOrder : order.getHighChildOrderList()) { - if (childOrder.getGoodsType() == 3) { - if (highOrderService.getGasTheDayOrderNum(order.getMemId()) >= 1) { - throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "已达到每日加油次数上限"); - } - - // 查询加油站 - HighMerchantStoreModel store = merchantStoreService.getMerchantStoreById(childOrder.getGoodsId()); - if (store == null) { - throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "已达到每日加油次数上限"); - } - // 来源类型 1：平台自建 2：团油 - if (store.getSourceType().equals(2)) { - // 查询账号余额 - JSONObject accountInfo2JD = TuanYouConfig.queryCompanyAccountInfo2JD(); - JSONArray result = accountInfo2JD.getJSONArray("result"); - for (Object accountObject : result) { - JSONObject account = (JSONObject)accountObject; - // 1:汽油:2:柴油;3:天然气 - if (account.getInteger("energyType") == childOrder.getGasOilType()) { - // 支付金额 大于 团油账号余额 - if(order.getPayPrice().compareTo(account.getBigDecimal("accountBalance")) == 1){ - log.error("OrderController --> orderToPay() ERROR", "无法进行支付，请联系平台客服"); - throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "无法进行支付，请联系平台客服"); - } - } - } - } - // 来源类型 1：平台自建 2：团油 - if (store.getSourceType().equals(MerchantStoreSourceType.type3.getNumber())) { - BigDecimal account = new BigDecimal("0"); - // 查询账号余额 - HighMerchantAccount merAccount = merchantAccountService.getMerAccountDetail(store.getMerchantId()); - if (merAccount != null) { - account = merAccount.getAmounts().subtract(merchantAccountService.countMerGasOilAmount(store.getMerchantId())); - } - // 客户加油金额 大于 商户账号余额 - if(order.getTotalPrice().compareTo(account) == 1) { - log.error("OrderController --> orderToPay() ERROR", "暂时无法进行支付，请联系平台客服"); - throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "暂时无法进行支付，请联系平台客服"); - } - } - } - } - - highOrderService.fleetOilCardPayOrder(userCard.getId(), order.getId(), carLicensePlate); - - new Thread(() -> { - // 查询订单信息 - if (order == null) { - throw ErrorHelp.genException(SysCode.System, ErrorCode.NOT_FOUND_ORDER, ""); - } - HighUser highUser = highUserService.findByUserId(order.getMemId()); - HighChildOrder presentation = highOrderService.getChildOrderByPresentation(order.getId()); - WxMsgConfig.pushOneUser( - presentation.getGoodsName() + "(" + GoodsType.getNameByType(presentation.getGoodsType()) + ")", - String.valueOf(order.getPayPrice()), - order.getOrderNo(), - order.getPayTime(), - PayType.getNameByType(order.getPayType()), order.getId(), - highUser.getOpenId()); - }).start(); +// SessionObject sessionObject = userCenter.getSessionObject(request); +// HighUserModel userInfoModel = (HighUserModel) sessionObject.getObject(); +// +// if (StringUtils.isBlank(reqBodyStr)) { +// log.error("orderToPay error!", "参数错误"); +// throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); +// } +// JSONObject jsonObject = JSONObject.parseObject(reqBodyStr); +// String cardNo = jsonObject.getString("cardNo"); +// Long orderId = jsonObject.getLong("orderId"); +// String password = jsonObject.getString("password"); +// String carLicensePlate = jsonObject.getString("carLicensePlate"); +// +// if (StringUtils.isBlank(cardNo) || orderId == null) { +// log.error("orderToPay error!", "参数错误"); +// throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); +// } +// // 查询用户支付密码 +// HighUserPayPassword userPayPassword = highUserPayPasswordService.getDetailByUser(userInfoModel.getHighUser().getId()); +// if (userPayPassword == null) { +// log.error("orderToPay error!", "未设置支付密码"); +// throw ErrorHelp.genException(SysCode.System, ErrorCode.NOT_SET_USER_PAY_PWD, ""); +// } +// if (StringUtils.isBlank(password)) { +// log.error("orderToPay error!", "未输入支付密码"); +// throw ErrorHelp.genException(SysCode.System, ErrorCode.NOT_ENTER_USER_PAY_PWD, ""); +// } +// // 校验支付密码是否一直 +// if (!AESEncodeUtil.aesEncrypt(password).equals(userPayPassword.getPassword())) { +// log.error("orderToPay error!", ""); +// throw ErrorHelp.genException(SysCode.System, ErrorCode.USER_PAY_PWD_ERROR, ""); +// } +// +// // 查询用户与卡号的关系 +// HighUserCard userCard = highUserCardService.getDetailByUserCardNo(userInfoModel.getHighUser().getId(), cardNo); +// if (userCard == null) { +// log.error("OrderController --> orderToPay() ERROR", "未绑定卡号"); +// throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未绑定卡号"); +// } +// HighOrder order = highOrderService.getOrderById(orderId); +// if(order == null) { +// log.error("OrderController --> orderToPay() ERROR", "未找到订单信息"); +// throw ErrorHelp.genException(SysCode.System, ErrorCode.NOT_FOUND_ORDER, ""); +// } +// //校验订单状态 订单状态：1 待支付 2 已支付 3.已完成 4. 已退款 5.已取消 +// if(order.getOrderStatus() != 1) { +// log.error("OrderController --> orderToPay() ERROR", "订单不处于待支付状态"); +// throw ErrorHelp.genException(SysCode.System, ErrorCode.ORDER_NO_STAY_PAY, ""); +// } +// +// // 商品类型 1:卡卷 2:金币充值 +// for (HighChildOrder childOrder : order.getHighChildOrderList()) { +// if (childOrder.getGoodsType() == 3) { +// if (highOrderService.getGasTheDayOrderNum(order.getMemId()) >= 1) { +// throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "已达到每日加油次数上限"); +// } +// +// // 查询加油站 +// HighMerchantStoreModel store = merchantStoreService.getMerchantStoreById(childOrder.getGoodsId()); +// if (store == null) { +// throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "已达到每日加油次数上限"); +// } +// // 来源类型 1：平台自建 2：团油 +// if (store.getSourceType().equals(2)) { +// // 查询账号余额 +// JSONObject accountInfo2JD = TuanYouConfig.queryCompanyAccountInfo2JD(); +// JSONArray result = accountInfo2JD.getJSONArray("result"); +// for (Object accountObject : result) { +// JSONObject account = (JSONObject)accountObject; +// // 1:汽油:2:柴油;3:天然气 +// if (account.getInteger("energyType") == childOrder.getGasOilType()) { +// // 支付金额 大于 团油账号余额 +// if(order.getPayPrice().compareTo(account.getBigDecimal("accountBalance")) == 1){ +// log.error("OrderController --> orderToPay() ERROR", "无法进行支付，请联系平台客服"); +// throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "无法进行支付，请联系平台客服"); +// } +// } +// } +// } +// // 来源类型 1：平台自建 2：团油 +// if (store.getSourceType().equals(MerchantStoreSourceType.type3.getNumber())) { +// BigDecimal account = new BigDecimal("0"); +// // 查询账号余额 +// HighMerchantAccount merAccount = merchantAccountService.getMerAccountDetail(store.getMerchantId()); +// if (merAccount != null) { +// account = merAccount.getAmounts().subtract(merchantAccountService.countMerGasOilAmount(store.getMerchantId())); +// } +// // 客户加油金额 大于 商户账号余额 +// if(order.getTotalPrice().compareTo(account) == 1) { +// log.error("OrderController --> orderToPay() ERROR", "暂时无法进行支付，请联系平台客服"); +// throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "暂时无法进行支付，请联系平台客服"); +// } +// } +// } +// } +// +// highOrderService.fleetOilCardPayOrder(userCard.getId(), order.getId(), carLicensePlate); +// +// new Thread(() -> { +// // 查询订单信息 +// if (order == null) { +// throw ErrorHelp.genException(SysCode.System, ErrorCode.NOT_FOUND_ORDER, ""); +// } +// HighUser highUser = highUserService.findByUserId(order.getMemId()); +// HighChildOrder presentation = highOrderService.getChildOrderByPresentation(order.getId()); +// WxMsgConfig.pushOneUser( +// presentation.getGoodsName() + "(" + GoodsType.getNameByType(presentation.getGoodsType()) + ")", +// String.valueOf(order.getPayPrice()), +// order.getOrderNo(), +// order.getPayTime(), +// PayType.getNameByType(order.getPayType()), order.getId(), +// highUser.getOpenId()); +// }).start(); return ResponseMsgUtil.success("支付成功"); } catch (Exception e) { diff --git a/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java b/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java index 2cbbf50b..e8528b5c 100644 --- a/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java +++ b/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 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 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 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 selectGasStaffHistoryOrderCount(@Param("gasStaffId") Long gasStaffId, @Param("status") String status); @Select({ @@ -1281,4 +1286,32 @@ public interface HighOrderMapperExt { }) List integralRebateOrder(); + @Select({"" + }) + List getApiThirdOrderByList(@Param("map") Map map); + } diff --git a/hai-service/src/main/java/com/hai/service/impl/HighFleetOilCardServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighFleetOilCardServiceImpl.java index 3fc1e41d..aa20f147 100644 --- a/hai-service/src/main/java/com/hai/service/impl/HighFleetOilCardServiceImpl.java +++ b/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 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); // 变更前金额 diff --git a/hai-user/target/classes/com/web/controller/WechatController.class b/hai-user/target/classes/com/web/controller/WechatController.class deleted file mode 100644 index c95e46c6..00000000 Binary files a/hai-user/target/classes/com/web/controller/WechatController.class and /dev/null differ diff --git a/hai-user/target/hai-user-1.0-SNAPSHOT.jar b/hai-user/target/hai-user-1.0-SNAPSHOT.jar index f97a08fc..057f7fa2 100644 Binary files a/hai-user/target/hai-user-1.0-SNAPSHOT.jar and b/hai-user/target/hai-user-1.0-SNAPSHOT.jar differ diff --git a/hai-user/target/hai-user-1.0-SNAPSHOT.jar.original b/hai-user/target/hai-user-1.0-SNAPSHOT.jar.original index 3397a7a9..72eb3c3e 100644 Binary files a/hai-user/target/hai-user-1.0-SNAPSHOT.jar.original and b/hai-user/target/hai-user-1.0-SNAPSHOT.jar.original differ diff --git a/hai-user/target/maven-archiver/pom.properties b/hai-user/target/maven-archiver/pom.properties index 13fb59ed..dd7478c0 100644 --- a/hai-user/target/maven-archiver/pom.properties +++ b/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 diff --git a/hai-user/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/hai-user/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index 3e298b9f..5463c603 100644 --- a/hai-user/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/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 diff --git a/hai-user/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/hai-user/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 01d35faa..f9c06f43 100644 --- a/hai-user/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/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 diff --git a/hai-user/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/hai-user/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst deleted file mode 100644 index e69de29b..00000000