czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

撤销修改

Browse Source
This commit is contained in:
wangw
2025-12-22 10:24:35 +08:00
parent 2bc5c8cff3
commit 102ee912a9
10 changed files with 9 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -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
username: cashier
password: Cashier@1@
url: jdbc:mysql://192.168.1.42:3306/czg_cashier?useUnicode=true&characterEncoding=utf-8
username: root
password: Chaozg123.
data:
redis:

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

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

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

@@ -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
username: cashier
password: Cashier@1@
url: jdbc:mysql://192.168.1.42:3306/czg_cashier?useUnicode=true&characterEncoding=utf-8
username: root
password: Chaozg123.
data:
redis:

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

@@ -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
*/

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

@@ -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);

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

@@ -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);
}
}

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

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

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

@@ -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());
}
}

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

@@ -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;