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

performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java

@@ -99,6 +99,11 @@ public enum PerformanceResultEnum implements ResultEnum {
 
     ORDER_GOODS_SAVE_FAIL(1801, "保存货单失败,请稍后再试"),
 
+    USER_ID_IS_EMPTY(1900, "用户ID不能为空"),
+    MOBILE_IS_EMPTY(1901, "用户手机号不能为空"),
+    CAPTCHA_IS_EMPTY(1901, "验证码不能为空"),
+    USER_ACCOUNT_NOT_FOUND(1902, "用户账号未找到"),
+
 
     ;
     private final int code;

performance-api/src/main/java/com/clx/performance/param/app/CheckMobileParam.java

+package com.clx.performance.param.app;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CheckMobileParam {
+
+    @ApiModelProperty(value = "手机号", example = "1")
+    @NotBlank(message = "手机号")
+    private String mobile;
+
+    @ApiModelProperty(value = "用户Id", example = "1")
+    @NotNull(message = "用户Id")
+    private Long userNo;
+
+    @ApiModelProperty(value = "验证码", example = "1")
+    @NotBlank(message = "验证码")
+    private String captcha;
+}

performance-web/pom.xml

@@ -45,6 +45,13 @@
             <artifactId>user-api</artifactId>
         </dependency>
 
+
+        <dependency>
+            <groupId>com.clx.cy</groupId>
+            <artifactId>message-api</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
+
         <dependency>
             <groupId>com.clx.cy</groupId>
             <artifactId>open-sdk</artifactId>

performance-web/src/main/java/com/clx/performance/PerformanceApplication.java

@@ -16,7 +16,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
 //        @ComponentScan("com.msl.common.utils.*"),
 //})
 @ComponentScan({"com.clx.performance.*", "com.msl.*"})
-@EnableFeignClients(basePackages = {"com.msl.*", "com.clx.performance.*", "com.clx.order.*", "com.clx.user.*"})
+@EnableFeignClients(basePackages = {"com.msl.*", "com.clx.performance.*", "com.clx.order.*", "com.clx.user.*", "com.clx.message.*"})
 @ViewScan(basePackage = "com.clx.user.view")
 public class PerformanceApplication {
 

performance-web/src/main/java/com/clx/performance/config/ClxMessageConfig.java

+package com.clx.performance.config;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@Getter
+@Setter
+@ConfigurationProperties(prefix = "clx.message")
+public class ClxMessageConfig {
+
+    //应用ID
+    private Long appId;
+
+    //渠道ID
+    private Integer channelId;
+
+    //短信验证码模板
+    private String captchaTemplateCode;
+
+}

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

 package com.clx.performance.controller.app;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.app.CheckMobileParam;
 import com.clx.performance.param.pc.PageAppPrepaidFreightAccountParam;
 import com.clx.performance.service.OwnerAccountService;
 import com.clx.performance.vo.pc.OwnerAccountRunningWaterRecordVO;
@@ -35,4 +36,12 @@ public class AppOwnerAccountController {
         IPage<OwnerAccountRunningWaterRecordVO> page = ownerAccountService.prepaidFreightOwnerAccountPageList(param);
         return Result.page(page.getRecords(), page.getTotal(), page.getPages());
     }
+
+
+    @ApiOperation(value = "验证手机号验证码", notes = "<br>By:胡宇帆")
+    @PostMapping("/checkMobile")
+    public Result<String> checkMobile(@RequestBody CheckMobileParam param) {
+        String token = ownerAccountService.checkMobile(param);
+        return Result.ok(token);
+    }
 }

performance-web/src/main/java/com/clx/performance/listener/LargeScreenListener.java

@@ -53,6 +53,7 @@ public class LargeScreenListener {
             log.info("处理数据大屏标准地址路线监听器执行,订单为{}", message);
             FeignOrderVO orderVO = JSONUtil.toBean(message, FeignOrderVO.class);
             if (ObjectUtil.isNull(orderVO.getSendSystemAddressId()) || ObjectUtil.isNull(orderVO.getReveiveSystemAddressId())) {
+                log.info("当前订单标准地址相关为空,不予处理");
                 return;
             }
             Integer receiveAddressId = orderVO.getReveiveSystemAddressId();
@@ -66,6 +67,7 @@ public class LargeScreenListener {
             } else {
                 ReceiveAndSendAddressVO feignAddressVO = Optional.of(addressFeign.getSendAndReceiveSystemAddress(sendAddressId, receiveAddressId)).filter(Result::succeed)
                         .map(Result::getData).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+                log.info("查询出标准地址相关坐标经纬度：{}", JSONUtil.parse(feignAddressVO));
                 BigDecimal sendAddressLatitude = feignAddressVO.getSendAddressVo().getLatitude().setScale(4, RoundingMode.DOWN);
                 BigDecimal sendAddressLongitude = feignAddressVO.getSendAddressVo().getLongitude().setScale(4, RoundingMode.DOWN);
 

performance-web/src/main/java/com/clx/performance/service/OwnerAccountService.java

@@ -2,6 +2,7 @@ package com.clx.performance.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.model.OwnerTransferInfo;
+import com.clx.performance.param.app.CheckMobileParam;
 import com.clx.performance.param.open.OpenOwnerBindCardParam;
 import com.clx.performance.param.open.OpenOwnerCaseOutParam;
 import com.clx.performance.param.open.OpenOwnerTopUpParam;
@@ -89,4 +90,6 @@ public interface OwnerAccountService {
     void createAccount(CreteAccountParam param);
 
     void ownerAccountThaw(ThawAccountParam param);
+
+    String checkMobile(CheckMobileParam param);
 }

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

@@ -176,10 +176,14 @@ public class LargeScreenServiceImpl implements LargeScreenService {
 
     @Override
     public String routeLine(Integer addressId) {
+        List<SystemAddressVO> list = Optional.of(orderFeign.getOrderListByReceiveAddressId(addressId)).filter(Result::succeed)
+                .map(Result::getData).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        List<Integer> addressIds = list.stream().map(SystemAddressVO::getId).collect(Collectors.toList());
+
         JSONArray jsonArray = new JSONArray();
         JSONObject jsonObject = new JSONObject();
         Query query = new Query();
-        query.addCriteria(Criteria.where("receiveSystemAddressId").is(addressId));
+        query.addCriteria(Criteria.where("receiveSystemAddressId").in(addressIds));
         List<MongoLargeScreenAddressRoute> routes = mongoTemplate.find(query, MongoLargeScreenAddressRoute.class);
         if (CollectionUtils.isEmpty(routes)) {
             return null;

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

@@ -4,12 +4,14 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.message.feign.ClxMessageOpenapiFeign;
 import com.clx.performance.component.IdGenerateSnowFlake;
 import com.clx.performance.dao.*;
 import com.clx.performance.enums.IdTypeEnum;
 import com.clx.performance.enums.OwnerAccountEnum;
 import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.model.*;
+import com.clx.performance.param.app.CheckMobileParam;
 import com.clx.performance.param.open.OpenOwnerBindCardParam;
 import com.clx.performance.param.open.OpenOwnerCaseOutParam;
 import com.clx.performance.param.open.OpenOwnerTopUpParam;
@@ -70,6 +72,8 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
 
     private final OwnerAccountStruct ownerAccountStruct;
 
+    private final ClxMessageOpenapiFeign clxMessageOpenapiFeign;
+
     @Override
     public IPage<OwnerAccountVO> pageList(PageOwnerAccountListParam param) {
         return ownerAccountDao.pageList(param);
@@ -881,4 +885,28 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
             }
         }
     }
+
+    @Override
+    public String checkMobile(CheckMobileParam param) {
+        Long userNo = param.getUserNo();
+        if (ObjectUtil.isNull(userNo)) {
+            throw new ServiceSystemException(PerformanceResultEnum.USER_ID_IS_EMPTY);
+        }
+
+        if (StringUtils.isBlank(param.getMobile())) {
+            throw new ServiceSystemException(PerformanceResultEnum.MOBILE_IS_EMPTY);
+        }
+
+        if (StringUtils.isBlank(param.getCaptcha())) {
+            throw new ServiceSystemException(PerformanceResultEnum.CAPTCHA_IS_EMPTY);
+        }
+
+        List<OwnerAccount> accountList = ownerAccountDao.accountInfo(param.getUserNo());
+        if (CollectionUtil.isEmpty(accountList)) {
+            throw new ServiceSystemException(PerformanceResultEnum.USER_ACCOUNT_NOT_FOUND);
+        }
+
+
+        return null;
+    }
 }