卡务中心双向同步

pom.xml

@@ -85,7 +85,7 @@
             </properties>
             <activation>
                 <!-- 默认环境 -->
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
             </activation>
         </profile>
         <profile>

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/DefaultConfig.java

@@ -1,8 +1,10 @@
 package org.dromara.common.core.config;
 
 import lombok.Data;
+import lombok.Getter;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.context.annotation.Configuration;
 
 /**
  * name: LockConfig
@@ -14,9 +16,10 @@ import org.springframework.boot.autoconfigure.AutoConfiguration;
  * @version 0.1
  * @since JDK 1.8
  */
-@AutoConfiguration
 @Data
+@AutoConfiguration
 public class DefaultConfig {
     @Value("${system.default-config.tenantId}")
     private String tenantId;
+
 }

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

@@ -166,16 +166,16 @@ public class CardBusiness {
     }
 
     public R<PtCardVo> writeCardSuccess(PtCardBo cardBo) throws InterruptedException {
-        PtCardBo queryBo = new PtCardBo();
-        if (cardBo.getCardNo() > 0) {
-            queryBo.setCardNo(cardBo.getCardNo());
-        }
-        if (cardBo.getFactoryId() > 0) {
-            queryBo.setFactoryId(cardBo.getFactoryId());
-        }
-        if (cardBo.getCardId() > 0) {
-            queryBo.setCardId(cardBo.getCardId());
-        }
+        PtCardBo queryBo = BeanUtil.copyProperties(cardBo,PtCardBo.class);
+        //if (cardBo.getCardNo() > 0) {
+        //    queryBo.setCardNo(cardBo.getCardNo());
+        //}
+        //if (cardBo.getFactoryId() > 0) {
+        //    queryBo.setFactoryId(cardBo.getFactoryId());
+        //}
+        //if (cardBo.getCardId() > 0) {
+        //    queryBo.setCardId(cardBo.getCardId());
+        //}
 
         // 补卡和换卡时需要注销旧卡
         if (ObjectUtil.equals(cardBo.getOperateType(), CardOperateEnum.REISSUE)

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

@@ -52,10 +52,22 @@ public class CardApiController extends BaseController {
     private final IPtCardService cardService;
     private final DefaultConfig defaultConfig;
 
-    @PostMapping({"/api/v1/new", "/api/v1/init","/api/v1/change","/api/v1/reissue"})
+    @PostMapping({"/api/v1/new", "/api/v1/change","/api/v1/reissue"})
     public ReturnResult initNewCard(@RequestBody Map<String, Object> initParam) {
         return getReturnResult(initParam);
     }
+
+    @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/change")
     //@SyncDataToLocal(eventType = CARD_OPERATION, sender = CARD_CENTER_SENDER)
     //public ReturnResult initChangeCard(@RequestBody Map<String, Object> initParam) {

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/config/DefaultConfig.java

@@ -1,22 +0,0 @@
-package org.dromara.backstage.config;
-
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * name: LockConfig
- * package: org.dromara.backstage.config
- * description: 酒店门锁系统API配置
- * date: 2024-11-20 08:46:52 08:46
- *
- * @author luoyibo
- * @version 0.1
- * @since JDK 1.8
- */
-@Configuration
-@Data
-public class DefaultConfig {
-    @Value("${system.default-config.tenantId}")
-    private String tenantId;
-}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/domain/convert/YcVoConvert.java

@@ -53,7 +53,7 @@ public class YcVoConvert {
         cardVo.setIssueFee(ObjectUtil.equals(vo.getProductCost(), null) ? BigDecimal.ZERO : vo.getProductCost());
         cardVo.setCommissionCharge(ObjectUtil.equals(vo.getCommissionCharge(), null) ? BigDecimal.ZERO : vo.getCommissionCharge());
         cardVo.setZheJiuFee(ObjectUtil.equals(vo.getDepreciation(), null) ? BigDecimal.ZERO : vo.getDepreciation());
-
+        cardVo.setTenantId(vo.getTenantId());
         return cardVo;
     }
 

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/domain/vo/card/PtCardVo.java

@@ -123,6 +123,10 @@ public class PtCardVo implements Serializable {
     @ExcelProperty(value = "最后交易餐类，对应营业时段的编号")
     private Long lastMeal;
 
+    /**
+     * 租户Id
+     */
+    private String tenantId;
     //region 根据卡片类型关联到的卡片押金、工本费等信息
     /**
      * 卡片类型名称

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/domain/vo/yc/YcCardVo.java

@@ -89,6 +89,11 @@ public class YcCardVo implements Serializable {
      * 卡片功能类型名称
      */
     private String cardFuncTypeName="用户卡";
+
+    /**
+     * 租户Id
+     */
+    private String tenantId;
     //endregion
 
     //region 根据卡片类型关联到的卡片押金、工本费等信息