撤销修改

cash-api/account-server/src/main/resources/application-dev.yml

@@ -37,9 +37,6 @@ dubbo:
     name: dubbo
     serialization: hessian2
     port: 10101
-  serialization:
-    allow-list:
-      - com.czg.utils.CzgUpdateChain
 
 
 

cash-api/account-server/src/main/resources/application-test.yml

@@ -2,9 +2,9 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://rm-bp1kn7h89nz62cno1ro.mysql.rds.aliyuncs.com:3306/czg_cashier?useUnicode=true&characterEncoding=utf-8
+    url: jdbc:mysql://192.168.1.42:3306/czg_cashier?useUnicode=true&characterEncoding=utf-8
-    username: cashier
+    username: root
-    password: Cashier@1@
+    password: Chaozg123.
 
   data:
     redis:

cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java

@@ -57,10 +57,9 @@ public class NotifyController {
     private MkShopConsumeDiscountRecordService consumeDiscountRecordService;
 
     @RequestMapping("clear")
-    public String clear() {
+    public String clear(@RequestParam Integer shopId) {
-        shopUserService.updateChain().eq(ShopUser::getId, 127437).set(ShopUser::getAmount, 999);
+        consumeDiscountRecordService.remove(new QueryWrapper().eq(MkShopConsumeDiscountRecord::getShopId, shopId));
-//        consumeDiscountRecordService.remove(new QueryWrapper().eq(MkShopConsumeDiscountRecord::getShopId, shopId));
+        orderInfoService.remove(new QueryWrapper().eq(OrderInfo::getShopId, shopId));
-//        orderInfoService.remove(new QueryWrapper().eq(OrderInfo::getShopId, shopId));
         return "success";
     }
 

cash-api/order-server/src/main/resources/application-test.yml

@@ -1,10 +1,9 @@
-
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://rm-bp1kn7h89nz62cno1ro.mysql.rds.aliyuncs.com:3306/czg_cashier?useUnicode=true&characterEncoding=utf-8
+    url: jdbc:mysql://192.168.1.42:3306/czg_cashier?useUnicode=true&characterEncoding=utf-8
-    username: cashier
+    username: root
-    password: Cashier@1@
+    password: Chaozg123.
 
   data:
     redis:

cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopUserService.java

@@ -5,10 +5,8 @@ import com.czg.account.dto.shopuser.ShopUserMoneyEditDTO;
 import com.czg.account.entity.ShopUser;
 import com.czg.market.entity.SmsPushEventUser;
 import com.czg.market.vo.InviteUserVO;
-import com.czg.utils.CzgUpdateChain;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.service.IService;
-import com.mybatisflex.core.update.UpdateChain;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -22,11 +20,6 @@ import java.util.List;
  */
 public interface ShopUserService extends IService<ShopUser> {
 
-    @Override
-    default UpdateChain<ShopUser> updateChain() {
-        return new CzgUpdateChain<>(getMapper());
-    }
-
     /**
      * 返回流水Id
      */

cash-common/cash-common-service/src/main/java/com/czg/market/service/TbMemberConfigService.java

@@ -6,8 +6,6 @@ import com.czg.exception.CzgException;
 import com.czg.market.dto.MemberConfigDTO;
 import com.czg.market.dto.MemberLevelDTO;
 import com.czg.market.vo.*;
-import com.czg.utils.CzgUpdateChain;
-import com.mybatisflex.core.update.UpdateChain;
 import com.mybatisflex.core.service.IService;
 import com.czg.market.entity.TbMemberConfig;
 
@@ -23,11 +21,6 @@ import java.util.List;
  */
 public interface TbMemberConfigService extends IService<TbMemberConfig> {
 
-    @Override
-    default UpdateChain<TbMemberConfig> updateChain() {
-        return CzgUpdateChain.of(getMapper());
-    }
-
     MemberConfigVO detail(Long shopId);
 
     UMemberConfigVO detail(Long shopId, Long userId);

cash-common/cash-common-tools/src/main/java/com/czg/utils/CzgUpdateChain.java

@@ -1,25 +0,0 @@
-package com.czg.utils;
-
-import com.mybatisflex.core.BaseMapper;
-import com.mybatisflex.core.update.UpdateChain;
-
-import java.io.Serial;
-import java.io.Serializable;
-
-/**
- * @author ww
- * @date 2023/8/23
- */
-public class CzgUpdateChain<T> extends UpdateChain<T> implements Serializable {
-
-    @Serial
-    private static final long serialVersionUID = 1L;
-
-    public CzgUpdateChain(BaseMapper<T> baseMapper) {
-        super(baseMapper);
-    }
-
-    public CzgUpdateChain(BaseMapper<T> baseMapper, T entityObject) {
-        super(baseMapper, entityObject);
-    }
-}

cash-service/code-generator/src/main/java/com/czg/CodeGen.java

@@ -189,7 +189,6 @@ public class CodeGen {
                 .setClassSuffix("Service")
                 .setSuperClass(IService.class);
         globalConfig.enableService();
-        globalConfig.setServiceTemplatePath("templates/service.tpl");
 
         //设置表前缀和只生成哪些表，setGenerateTable 未配置时，生成所有表
         globalConfig.getStrategyConfig()

cash-service/code-generator/src/main/resources/templates/service.tpl

@@ -1,20 +0,0 @@
-package #(packageConfig.servicePackage);
-
-import com.czg.utils.CzgUpdateChain;
-import com.mybatisflex.core.update.UpdateChain;
-import #(serviceConfig.buildSuperClassImport());
-import #(packageConfig.entityPackage).#(table.buildEntityClassName());
-
-/**
- * #(table.getComment()) 服务层。
- *
- * @author #(javadocConfig.getAuthor())
- * @since #(javadocConfig.getSince())
- */
-public interface #(table.buildServiceClassName()) extends #(serviceConfig.buildSuperClassName())<#(table.buildEntityClassName())> {
-
-    @Override
-    default UpdateChain<#(table.buildEntityClassName())> updateChain() {
-        return CzgUpdateChain.of(getMapper());
-    }
-}

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java

@@ -30,7 +30,6 @@ import com.czg.order.service.OrderPaymentService;
 import com.czg.service.market.enums.OrderStatusEnums;
 import com.czg.service.market.mapper.TbMemberConfigMapper;
 import com.czg.utils.AssertUtil;
-import com.czg.utils.CzgUpdateChain;
 import com.czg.validator.ValidatorUtil;
 import com.czg.validator.group.member.MemberLevelCycleRewardGroup;
 import com.mybatisflex.core.query.QueryWrapper;