Merge remote-tracking branch 'origin/v7.0_small_version_fix_20231120' into…

performance-web/src/main/java/com/clx/performance/aspect/ResetPasswordAnnotationAop.java

@@ -104,12 +104,15 @@ public class ResetPasswordAnnotationAop {
         Object returnVal = null;
 
         returnVal = jp.proceed();
-        Result result = JSONUtil.toBean(JSONUtil.parse(returnVal).toString(), Result.class);
+        if (!StringUtils.equals(aspectAnnotation.name(), "resetPassword")) {
+            Result result = JSONUtil.toBean(JSONUtil.parse(returnVal).toString(), Result.class);
 
-        redisTemplate.opsForValue().set(RedisConstants.MESSAGE_RESET_PASSWORD_TOKEN + mobile, result.getData().toString());
-        redisTemplate.expire(RedisConstants.MESSAGE_RESET_PASSWORD_TOKEN + mobile, 60, TimeUnit.SECONDS);
+            redisTemplate.opsForValue().set(RedisConstants.MESSAGE_RESET_PASSWORD_TOKEN + mobile, result.getData().toString());
+            redisTemplate.expire(RedisConstants.MESSAGE_RESET_PASSWORD_TOKEN + mobile, 60, TimeUnit.SECONDS);
+        }
 
         return returnVal;
+
     }
 
 }

performance-web/src/main/java/com/clx/performance/component/OrderCancelComponent.java

@@ -31,6 +31,7 @@ import com.msl.common.utils.DateUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
@@ -40,34 +41,45 @@ import java.util.stream.Collectors;
 
 @Component
 @Slf4j
-@AllArgsConstructor
 public class OrderCancelComponent implements InitializingBean {
 
-    private final OrderChildDao orderChildDao;
+    @Autowired
+    private OrderChildDao orderChildDao;
 
-    private final OrderGoodsDao orderGoodsDao;
+    @Autowired
+    private OrderGoodsDao orderGoodsDao;
 
-    private final OrderGoodsTruckBindService orderGoodsTruckBindService;
+    @Autowired
+    private OrderGoodsTruckBindService orderGoodsTruckBindService;
 
-    private final GoodsOrderTruckRecordComponent goodsOrderTruckRecordComponent;
+    @Autowired
+    private GoodsOrderTruckRecordComponent goodsOrderTruckRecordComponent;
 
-    private final OrderFeign orderFeign;
+    @Autowired
+    private OrderFeign orderFeign;
 
-    private final DriverService driverService;
+    @Autowired
+    private DriverService driverService;
 
-    private final BreakContractSettlementOwnerService breakContractSettlementOwnerService;
+    @Autowired
+    private BreakContractSettlementOwnerService breakContractSettlementOwnerService;
 
     public static Map<Integer, String> statusCodeMap = new HashMap<>();
 
-    private final IntegralMqService integralMqService;
+    @Autowired
+    private IntegralMqService integralMqService;
 
-    private final OrderChildLogService orderChildLogService;
+    @Autowired
+    private OrderChildLogService orderChildLogService;
 
-    private final OrderChildPostService orderChildPostService;
+    @Autowired
+    private OrderChildPostService orderChildPostService;
 
-    private final OrderService orderService;
+    @Autowired
+    private OrderService orderService;
 
-    private final OrderGoodsService orderGoodsService;
+    @Autowired
+    private OrderGoodsService orderGoodsService;
 
     public List<String> ownerProcess(OrderCancelParam param) {
         String orderNo = param.getOrderNo();

performance-web/src/main/java/com/clx/performance/controller/app/AppGoodsOrderController.java

@@ -70,4 +70,9 @@ public class AppGoodsOrderController {
     }
 
 
+    @ApiOperation(value = "司机端无接单位置上报", notes = "<br>By:胡宇帆")
+    @GetMapping("/getCancelOrderGoods")
+    public Result<List<OrderGoodsAPPVO>> getCancelOrderGoods(@RequestParam(value = "userNo") Long userNo) {
+        return Result.ok(orderGoodsTruckBindService.getCancelOrderGoods(userNo));
+    }
 }

performance-web/src/main/java/com/clx/performance/controller/pc/LargeScreenController.java

@@ -2,8 +2,6 @@ package com.clx.performance.controller.pc;
 
 import cn.hutool.json.JSONUtil;
 import com.clx.performance.service.LargeScreenService;
-import com.clx.performance.service.OrderChildService;
-import com.clx.user.feign.DriverFeign;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -15,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.constraints.NotNull;
-import java.util.List;
 
 @Slf4j
 @RestController

performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java

@@ -48,6 +48,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -63,46 +64,45 @@ import java.util.stream.Collectors;
  */
 @Service
 @Slf4j
-@AllArgsConstructor
 public class OrderGoodsServiceImpl implements OrderGoodsService {
 
-
+    @Autowired
     private OrderGoodsDao orderGoodsDao;
 
-
+    @Autowired
     private OrderGoodsStruct orderGoodsStruct;
 
-
+    @Autowired
     private OrderFeign orderFeign;
 
-
+    @Autowired
     private OrderGoodsTruckBindDao orderGoodsTruckBindDao;
 
-
+    @Autowired
     private OrderGoodsDriverTruckDao orderGoodsDriverTruckDao;
-
+    @Autowired
     private OrderGoodsLogService orderGoodsLogService;
 
-
+    @Autowired
     private UserClxFeign userClxFeign;
 
-
+    @Autowired
     private OrderChildDao orderChildDao;
-
+    @Autowired
     private GoodsOrderTruckRecordComponent goodsOrderTruckRecordComponent;
 
-
+    @Autowired
     private OrderGoodsStatusLazyComponent orderGoodsStatusLazyComponent;
-
+    @Autowired
     private DriverService driverService;
-
+    @Autowired
     private OrderCancelComponent orderCancelComponent;
-
-    private final IntegralMqService integralMqService;
-
-    private final OrderChildLogService orderChildLogService;
-
-    private final OrderChildPostService orderChildPostService;
+    @Autowired
+    private IntegralMqService integralMqService;
+    @Autowired
+    private OrderChildLogService orderChildLogService;
+    @Autowired
+    private OrderChildPostService orderChildPostService;
 
     @Override
     public OrderGoodsVO getOrderGoodsInfoByOrderGoodsNoForPC(String orderGoodsNo) {

performance-web/src/main/java/com/clx/performance/service/impl/OwnerAccountServiceImpl.java

@@ -969,7 +969,8 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
         }
 
         Object code = JSONUtil.parse(content).getByPath("code");
-        if (!ObjectUtil.equal(code,param.getCaptcha())) {
+        if (!StringUtils.equals(code.toString(),param.getCaptcha())) {
+            log.info("redis验证码：{}, 用户提交验证码：{}", code, param.getCaptcha());
             throw new ServiceSystemException(PerformanceResultEnum.CAPTCHA_IS_FAIL);
         }
 
@@ -982,7 +983,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
         req.setTemplateCode(messageConfig.getCaptchaTemplateCode());
         JSONObject jsonObject = new JSONObject();
         //随机生成4位数字
-        jsonObject.set("code", (int) (Math.random() * 9000) + 1000);
+        jsonObject.set("code", (int) (Math.random() * 900000) + 100000);
         //默认3分钟
         jsonObject.set("time", "3");
         req.setChannelId(messageConfig.getChannelId());
@@ -999,12 +1000,12 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
     public String checkBusinessLicenseNumber(InformationParam param) {
         Long userNo = TokenUtil.getLoginUserInfo().getUserNo();
         OwnerInfoFeignVO ownerInfoFeignVO = Optional.ofNullable(ownerFeign.getUserCompany(userNo)).filter(Result::succeed).map(Result::getData).orElseThrow(ResultCodeEnum.FAIL);
-        String companyBusinessNo = ownerInfoFeignVO.getCompanyBusinessNo();
-        if (StringUtils.isBlank(companyBusinessNo)) {
+        String companyTaxCode = ownerInfoFeignVO.getCompanyTaxCode();
+        if (StringUtils.isBlank(companyTaxCode)) {
             throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND);
         }
 
-        if (!StringUtils.equals(companyBusinessNo, param.getBusinessLicenseNumber())) {
+        if (!StringUtils.equals(companyTaxCode, param.getBusinessLicenseNumber())) {
             throw new ServiceSystemException(PerformanceResultEnum.BUSINESS_NO_FAIL);
 
         }