Merge branch 'develop' into develop-kjf

.drone.yml

@@ -135,12 +135,12 @@ steps:
 
 trigger:
   branch:
-    include:
-      - release-gateway
+    - release-gateway
   event:
-    include:
-      - pull_request
-      - push
+    - push
+  #排除合并请求
+  exclude:
+    - ref: refs/pull/*
 
 ---
 kind: pipeline
@@ -230,12 +230,12 @@ steps:
         - echo ====部署成功=======
 trigger:
   branch:
-    include:
-      - release-transfer
+    - release-transfer
   event:
-    include:
-      - pull_request
-      - push
+    - push
+  #排除合并请求
+  exclude:
+    - ref: refs/pull/*
 
 ---
 kind: pipeline
@@ -329,12 +329,12 @@ steps:
 
 trigger:
   branch:
-    include:
-      - release-quartz
+    - release-quartz
   event:
-    include:
-      - pull_request
-      - push
+    - push
+  #排除合并请求
+  exclude:
+    - ref: refs/pull/*
 
 ---
 kind: pipeline
@@ -486,12 +486,12 @@ steps:
 
 trigger:
   branch:
-    include:
-      - release-system
+    - release-system
   event:
-    include:
-      - pull_request
-      - push
+    - push
+  #排除合并请求
+  exclude:
+    - ref: refs/pull/*
 ---
 kind: pipeline
 type: docker
@@ -642,12 +642,12 @@ steps:
 
 trigger:
   branch:
-    include:
-      - release-user
+    - release-user
   event:
-    include:
-      - pull_request
-      - push
+    - push
+  #排除合并请求
+  exclude:
+    - ref: refs/pull/*
 
 ---
 kind: pipeline
@@ -799,12 +799,12 @@ steps:
 
 trigger:
   branch:
-    include:
-      - release-product
+    - release-product
   event:
-    include:
-      - pull_request
-      - push
+    - push
+  #排除合并请求
+  exclude:
+    - ref: refs/pull/*
 
 ---
 kind: pipeline

kxs-common/kxs-common-idempotent/src/main/java/com/kxs/common/idempotent/IdempotentAutoConfiguration.java

@@ -1,8 +1,11 @@
 package com.kxs.common.idempotent;
 
+import cn.hutool.core.util.StrUtil;
 import com.kxs.common.idempotent.aspect.IdempotentAspect;
+import com.kxs.common.idempotent.config.RedisProperties;
 import com.kxs.common.idempotent.expression.ExpressionResolver;
 import com.kxs.common.idempotent.expression.KeyResolver;
+import lombok.AllArgsConstructor;
 import org.redisson.Redisson;
 import org.redisson.api.RedissonClient;
 import org.redisson.config.Config;
@@ -11,6 +14,7 @@ import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -23,10 +27,11 @@ import org.springframework.context.annotation.Configuration;
 @AutoConfiguration
 @Configuration(proxyBeanMethods = false)
 @AutoConfigureAfter(RedisAutoConfiguration.class)
+@EnableConfigurationProperties({ RedisProperties.class })
+@AllArgsConstructor
 public class IdempotentAutoConfiguration {
 
-	@Value("${spring.data.redis.host}")
-	private String host;
+	private final RedisProperties redisProperties;
 
 	/**
 	 * 切面 拦截处理所有 @Idempotent
@@ -51,7 +56,13 @@ public class IdempotentAutoConfiguration {
 	@ConditionalOnMissingBean
 	public RedissonClient redissonClient() {
 		Config config = new Config();
-		config.useSingleServer().setAddress("redis://"+host+":6379");
+		config.useSingleServer().setAddress(redisProperties.getPrefix() + redisProperties.getHost() + ":" + redisProperties.getPort());
+		if(StrUtil.isNotBlank(redisProperties.getUsername())){
+			config.useSingleServer().setUsername(redisProperties.getUsername());
+		}
+		if(StrUtil.isNotBlank(redisProperties.getPassword())){
+			config.useSingleServer().setPassword(redisProperties.getPassword());
+		}
 		return Redisson.create(config);
 	}
 

kxs-common/kxs-common-idempotent/src/main/java/com/kxs/common/idempotent/config/RedisProperties.java

@@ -0,0 +1,38 @@
+package com.kxs.common.idempotent.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * redis配置属性
+ *
+ * @author 没秃顶的码农
+ * @date 2024-04-24
+ */
+@Data
+@ConfigurationProperties(prefix = "spring.data.redis")
+public class RedisProperties {
+
+    private String prefix = "redis://";
+
+    /**
+     * host
+     */
+    private String host;
+
+    /**
+     * username
+     */
+    private String username;
+
+    /**
+     * pwd
+     */
+    private String password;
+
+    /**
+     * port
+     */
+    private String port = "6379";
+}

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/dto/kxsapp/gd/GdReportDTO.java

@@ -30,7 +30,7 @@ public class GdReportDTO {
      */
     @Schema(description = "sn码")
     @NotBlank(message = "sn码不能为空")
-    @Sn
+    @Sn(message = "请输入正确的SN")
     private String gdSn;
 
 

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/controller/admin/SysGdController.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kxs.common.core.util.R;
 import com.kxs.common.idempotent.annotation.Idempotent;
 import com.kxs.product.api.model.KxsGdReport;
+import com.kxs.product.biz.constant.enums.GdReportEnum;
 import com.kxs.product.biz.service.KxsGdReportService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -40,6 +41,7 @@ public class SysGdController {
     public R page(Page<KxsGdReport> page, KxsGdReport param) {
         return R.ok(kxsGdReportService.page(page,
                 Wrappers.<KxsGdReport>lambdaQuery().eq(StrUtil.isNotBlank(param.getGdSn()),KxsGdReport::getGdSn, param.getGdSn())
+                        .eq(KxsGdReport::getStatus, GdReportEnum.REPORT.getType())
                         .eq(StrUtil.isNotBlank(param.getGdMobile()),KxsGdReport::getGdMobile, param.getGdMobile())
                         .eq(StrUtil.isNotBlank(param.getUserCode()),KxsGdReport::getUserCode, param.getUserCode())
                         .eq(param.getIsCheck() != null, KxsGdReport::getIsCheck, param.getIsCheck())

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsGdReportServiceImpl.java

@@ -115,6 +115,10 @@ public class KxsGdReportServiceImpl extends ServiceImpl<KxsGdReportMapper, KxsGd
         if(report != null){
             throw new GlobalCustomerException("该工单sn已报备");
         }
+        KxsGdReport reportMobile = this.getOne(Wrappers.<KxsGdReport>lambdaQuery().eq(KxsGdReport::getGdMobile, param.getGdMobile()));
+        if(reportMobile != null){
+            throw new GlobalCustomerException("该工单广电手机号码已报备");
+        }
 
 
         kxsGdReport.setStatus(GdReportEnum.REPORT.getType());

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsGdServiceImpl.java

@@ -61,13 +61,14 @@ public class KxsGdServiceImpl implements KxsGdService {
                                 .eq(KxsGdReport::getGdSn, gdQueryOrder.getIccId())
                                 .eq(KxsGdReport::getGdMobile, gdQueryOrder.getPhoneNo()));
                         if (kxsGdReport != null) {
-                            kxsGdReportMapper.update(null, Wrappers.<KxsGdReport>lambdaUpdate().eq(KxsGdReport::getId, kxsGdReport.getId())
-                                    .set(KxsGdReport::getIsCheck, GdReportEnum.CHECK_SUC.getType())
-                                    .set(KxsGdReport::getGdMobile, gdQueryOrder.getPhoneNo()));
                             //发送广电激活MQ消息
                             RabbitGdActQueueMQ.MsgEntity msgEntity = new RabbitGdActQueueMQ.MsgEntity();
                             BeanUtil.copyProperties(gdQueryOrder, msgEntity);
                             mqSender.send(RabbitGdActQueueMQ.build(msgEntity));
+
+                            kxsGdReportMapper.update(null, Wrappers.<KxsGdReport>lambdaUpdate().eq(KxsGdReport::getId, kxsGdReport.getId())
+                                    .set(KxsGdReport::getIsCheck, GdReportEnum.CHECK_SUC.getType())
+                                    .set(KxsGdReport::getGdMobile, gdQueryOrder.getPhoneNo()));
                             log.info("发送广电激活数据{}", kxsGdReport.getGdSn()
                                     + "," + kxsGdReport.getGdMobile());
                         }

kxs-product/kxs-product-biz/src/main/resources/mapper/KxsGdReportMapper.xml

@@ -30,7 +30,7 @@
             and user_id = #{userId}
             and status = #{status}
             <if test="keyword != null and keyword != ''">
-                and (put_name = #{keyword} or put_mobile = #{keyword})
+                and (put_name = #{keyword} or put_mobile = #{keyword} or gd_mobile = #{keyword})
             </if>
         </where>
         order by id desc

kxs-transfer/src/main/java/com/kxs/transfer/api/service/product/impl/KxsMerchantServiceImpl.java

@@ -101,9 +101,9 @@ public class KxsMerchantServiceImpl extends ServiceImpl<KxsMerchantMapper, KxsMe
                     break;
             }
         }
-        KxsMerchant kxsMerchant = baseMapper.selectById(merchant.getId());
 
         if(operation.equals(OperationType.INSERT)){
+            KxsMerchant kxsMerchant = baseMapper.selectById(merchant.getId());
             if(kxsMerchant == null){
                 baseMapper.insert(merchant);
             }

kxs-transfer/src/main/java/com/kxs/transfer/api/service/user/impl/KxsLeaderServiceImpl.java

@@ -74,7 +74,7 @@ public class KxsLeaderServiceImpl extends ServiceImpl<KxsLeaderMapper, KxsLeader
             if(id != leader.getUserId()){
                 return;
             }
-            KxsLeader kxsLeader = baseMapper.selectById(leader.getId());
+            KxsLeader kxsLeader = baseMapper.selectById(id);
             if (kxsLeader != null){
                 baseMapper.updateById(leader);
             }else{

kxs-transfer/src/main/java/com/kxs/transfer/api/service/user/impl/KxsUserAmountLogServiceImpl.java

@@ -102,6 +102,9 @@ public class KxsUserAmountLogServiceImpl extends ServiceImpl<KxsUserAmountLogMap
                 case "AfterBalanceAmount":
                     userAmountLog.setAfterAmount(new BigDecimal(validFieldDataMap.get(field).toString()));
                     break;
+                case "QueryCount":
+                    userAmountLog.setVariationCause(validFieldDataMap.get(field).toString());
+                    break;
                 case "Remark":
                     userAmountLog.setRemark(validFieldDataMap.get(field).toString());
                     break;

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsLeader.java

@@ -53,9 +53,7 @@ public class KxsLeader extends Model<KxsLeader> implements Serializable {
     /**
      * 删除标记，0未删除，1已删除
      */
-    @TableLogic
     @Schema(description = "删除标记，0未删除，1已删除")
-    @TableField(fill = FieldFill.INSERT)
     private String delFlag;
 
 

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsUserAmountLog.java

@@ -115,7 +115,7 @@ public class KxsUserAmountLog extends Model<KxsUserAmountLog> implements Seriali
 
 
     /**
-     * 原因
+     * 原因 扩展字段
      */
     @Schema(description = "原因")
     private String variationCause;