feature: 发卡片业务处理完善

pom.xml

@@ -92,12 +92,12 @@
             <id>prod</id>
             <properties>
                 <profiles.active>prod</profiles.active>
-                <nacos.server>172.16.137.72:8848</nacos.server>
+                <nacos.server>10.32.23.157:8848</nacos.server>
                 <nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
                 <nacos.config.group>DEFAULT_GROUP</nacos.config.group>
                 <nacos.username>nacos</nacos.username>
                 <nacos.password>nacos</nacos.password>
-                <logstash.address>172.16.137.72:4560</logstash.address>
+                <logstash.address>10.32.23.157:4560</logstash.address>
             </properties>
             <activation>
                 <!-- 默认环境 -->

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/business/card/CardBusiness.java

@@ -142,7 +142,10 @@ public class CardBusiness {
             return R.fail(result.getData());
         }
         // 所有逻辑校验通过，入库
-        cardBo.setCardNo(cardNoBusiness.getCardNo());
+        if (cardBo.getCardNo() == 0) {
+            cardBo.setCardNo(cardNoBusiness.getCardNo());
+        }
+        //cardBo.setCardNo(cardNoBusiness.getCardNo());
         cardBo.setStatus(CardStatusEnum.NORMAL.code().toString());
         cardBo.setChangeTime(DateUtil.date());
         PtCardVo cardVo = ptCardService.saveOrUpdate(cardBo);

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/cardCenter/controller/CardApiController.java

@@ -20,6 +20,7 @@ import org.dromara.common.core.enums.ResultCodeEnum;
 import org.dromara.common.core.exception.ApiException;
 import org.dromara.common.message.kafka.aop.annotation.SyncDataToLocal;
 import org.dromara.common.web.core.BaseController;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -49,31 +50,24 @@ public class CardApiController extends BaseController {
     private final CardBusiness cardBusiness;
     private final IPtCardService cardService;
 
-    @PostMapping("/api/v1/new")
+    @PostMapping({"/api/v1/new", "/api/v1/init"})
     @SyncDataToLocal(eventType = CARD_OPERATION, sender = CARD_CENTER_SENDER)
     public ReturnResult initNewCard(@RequestBody Map<String, Object> initParam) {
-        PtCardBo bo = getInitInfo(initParam);
-        InitCardVo initCardVo = new InitCardVo();
-        R<ResultInfo> result = cardBusiness.initEntityCard(bo, initCardVo);
-        if (R.isSuccess(result)) {
-            return ReturnResult.success(YcVoConvert.initCardVoCovert(initCardVo));
-        }
-        throw new ApiException(result.getData().getDetail(), result.getData().getCode());
+        return getReturnResult(initParam);
     }
     @PostMapping("/api/v1/change")
     @SyncDataToLocal(eventType = CARD_OPERATION, sender = CARD_CENTER_SENDER)
     public ReturnResult initChangeCard(@RequestBody Map<String, Object> initParam) {
-        PtCardBo bo = getInitInfo(initParam);
-        InitCardVo initCardVo = new InitCardVo();
-        R<ResultInfo> result = cardBusiness.initEntityCard(bo, initCardVo);
-        if (R.isSuccess(result)) {
-            return ReturnResult.success(YcVoConvert.initCardVoCovert(initCardVo));
-        }
-        throw new ApiException(result.getData().getDetail(), result.getData().getCode());
+        return getReturnResult(initParam);
     }
     @PostMapping("/api/v1/reissue")
     @SyncDataToLocal(eventType = CARD_OPERATION, sender = CARD_CENTER_SENDER)
     public ReturnResult initReissueCard(@RequestBody Map<String, Object> initParam) {
+        return getReturnResult(initParam);
+    }
+
+    @NotNull
+    private ReturnResult getReturnResult(@RequestBody Map<String, Object> initParam) {
         PtCardBo bo = getInitInfo(initParam);
         InitCardVo initCardVo = new InitCardVo();
         R<ResultInfo> result = cardBusiness.initEntityCard(bo, initCardVo);
@@ -82,6 +76,7 @@ public class CardApiController extends BaseController {
         }
         throw new ApiException(result.getData().getDetail(), result.getData().getCode());
     }
+
     @PostMapping("/api/v1/write/success")
     public ReturnResult writeNewCardOk(@RequestBody Map<String, Object> initParam) throws InterruptedException {
         PtCardBo bo = getInitInfo(initParam);
@@ -164,15 +159,15 @@ public class CardApiController extends BaseController {
         return bo;
     }
 
-    @PostMapping("/api/v1/init")
-    public ReturnResult initSefNewCard(@RequestBody Map<String, Object> initParam) {
-        PtCardBo bo = getInitInfo(initParam);
-        InitCardVo initCardVo = new InitCardVo();
-        R<ResultInfo> result = cardBusiness.initEntityCard(bo, initCardVo);
-        if (R.isSuccess(result)) {
-            PtCardVo cardVo = initCardVo.getCard();
-            return ReturnResult.success(YcVoConvert.cardVoConvert(cardVo));
-        }
-        throw new ApiException(result.getData().getDetail(), result.getData().getCode());
-    }
+    //@PostMapping("/api/v1/init")
+    //public ReturnResult initSefNewCard(@RequestBody Map<String, Object> initParam) {
+    //    PtCardBo bo = getInitInfo(initParam);
+    //    InitCardVo initCardVo = new InitCardVo();
+    //    R<ResultInfo> result = cardBusiness.initEntityCard(bo, initCardVo);
+    //    if (R.isSuccess(result)) {
+    //        PtCardVo cardVo = initCardVo.getCard();
+    //        return ReturnResult.success(YcVoConvert.cardVoConvert(cardVo));
+    //    }
+    //    throw new ApiException(result.getData().getDetail(), result.getData().getCode());
+    //}
 }

ruoyi-server/ruoyi-server-mqdata/src/main/java/org/dromara/server/mq/consumer/KafkaConsumer.java

@@ -43,11 +43,11 @@ public class KafkaConsumer {
         if(ObjUtil.equals(sender,"000")) {
             try {
                 //是接收云端消费
-                String cloudConsume = remotePtParameterService.getPtParameterByKey("GET_CLOUD_CONSUME");
-                if(ObjectUtil.equals(cloudConsume,"1")){
-                    log.info("[处理云端消费请求]-[消信息:{}]", receiveMsg);
+                //String cloudConsume = remotePtParameterService.getPtParameterByKey("GET_CLOUD_CONSUME");
+                //if(ObjectUtil.equals(cloudConsume,"1")){
+                //    log.info("[处理云端消费请求]-[消信息:{}]", receiveMsg);
                     eventStrategyContext.doMsgHandle(eventType, eventMsg);
-                }
+                //}
             } catch (Exception e) {
                 log.error("[kafka消息处理失败]-[消息:{}-[错误:{}]", receiveMsg, e.getMessage());
             }

ruoyi-server/ruoyi-server-mqdata/src/main/java/org/dromara/server/mq/event/kafka/impl/card/CloudConsumeEventStrategyImpl.java

@@ -46,7 +46,7 @@ public class CloudConsumeEventStrategyImpl implements IEventStrategy {
         // recordBo.setCreditType(CreditTypeEnum.TERM_CONSUME);
         // recordBo.setTenantId(DefaultConstants.TENANT_ID);
         // recordBo.setUseType(SystemUseTypeEnum.CONSUME);
-
+        log.info("[处理云端消费请求]-[消信息:{}]", JSONUtil.toJsonStr(recordBo));
         remoteConsumeService.dealKafkaConsumeData(recordBo);
     }
 }