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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Tankaikai 2025-03-19 14:16:31 +08:00
parent fbd608bf17 5e7de375b4
commit 14ae8fbb10
8 changed files with 220 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cash-api/account-server/src/main/java/com/czg/controller/admin/ShopUserController.java
View File

@ -70,6 +70,7 @@ public class ShopUserController {
queryWrapper.eq(ShopUserFlow::getBizCode, bizCode);
}
queryWrapper.orderBy(ShopUserFlow::getCreateTime, false);
queryWrapper.orderBy(ShopUserFlow::getId, true);
return CzgResult.success(shopUserFlowService.page(PageUtil.buildPage(), queryWrapper));
}

53
cash-api/account-server/src/main/resources/application-prod.yml Normal file
View File

@ -0,0 +1,53 @@
spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://rm-bp1b572nblln4jho2po.mysql.rds.aliyuncs.com:3306/czg_cashier_test?useUnicode=true&characterEncoding=utf-8
username: root
password: Czg666888
data:
redis:
host: 121.40.109.122
port: 6379
password: chaozg123
timeout: 1000
database: 3
cloud:
nacos:
discovery:
server-addr: 121.40.109.122:8848
namespace: 237e1905-0a66-4375-9bb6-a51c3c034aca
rabbitmq:
host: 121.40.109.122
port: 5672
username: chaozg
password: chaozg123
dubbo:
application:
name: account-server
qos-port: 22223
qos-enable: true
registry:
address: nacos://121.40.109.122:8848 # Nacos 服务地址
group: server-prod
protocol:
threads: 20
port: 10103
name: dubbo
serialization: hessian2
seata:
application-id: account-server
tx-service-group: group_seata
config:
type: nacos
nacos:
server-addr: 121.40.109.122:8848
namespace:
group: group_seata

56
cash-api/order-server/src/main/resources/application-prod.yml Normal file
View File

@ -0,0 +1,56 @@
spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://rm-bp1b572nblln4jho2po.mysql.rds.aliyuncs.com:3306/czg_cashier_test?useUnicode=true&characterEncoding=utf-8
username: root
password: Czg666888
data:
redis:
host: 121.40.109.122
port: 6379
password: chaozg123
timeout: 1000
database: 3
cloud:
nacos:
discovery:
server-addr: 121.40.109.122:8848
namespace: 237e1905-0a66-4375-9bb6-a51c3c034aca
rabbitmq:
host: 121.40.109.122
port: 5672
username: chaozg
password: chaozg123
dubbo:
application:
name: order-server
qos-port: 22233
qos-enable: true
logger: log4j2
environment: test
registry:
address: nacos://121.40.109.122:8848 # Nacos 服务地址
group: server-prod
protocol:
port: 10203
threads: 20
name: dubbo
serialization: hessian2
seata:
application-id: order-server
tx-service-group: group_seata
config:
type: nacos
nacos:
server-addr: 121.40.109.122:8848
namespace:
group: group_seata

50
cash-api/product-server/src/main/resources/application-prod.yml Normal file
View File

@ -0,0 +1,50 @@
spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://rm-bp1b572nblln4jho2po.mysql.rds.aliyuncs.com:3306/czg_cashier_test?useUnicode=true&characterEncoding=utf-8
username: root
password: Czg666888
data:
redis:
host: 121.40.109.122
port: 6379
password: chaozg123
timeout: 1000
database: 3
cloud:
nacos:
discovery:
server-addr: 121.40.109.122:8848
namespace: 237e1905-0a66-4375-9bb6-a51c3c034aca
rabbitmq:
host: 121.40.109.122
port: 5672
username: chaozg
password: chaozg123
dubbo:
application:
name: product-server
qos-port: 22243
qos-enable: true
registry:
address: nacos://121.40.109.122:8848 # Nacos 服务地址
group: server-prod
protocol:
port: 10303
threads: 20
name: dubbo
serialization: hessian2
seata:
application-id: product-server
tx-service-group: group_seata
config:
type: nacos
nacos:
server-addr: 121.40.109.122:8848
namespace:
group: group_seata

53
cash-api/system-server/src/main/resources/application-prod.yml Normal file
View File

@ -0,0 +1,53 @@
spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://rm-bp1b572nblln4jho2po.mysql.rds.aliyuncs.com:3306/czg_cashier_test?useUnicode=true&characterEncoding=utf-8
username: root
password: Czg666888
data:
redis:
host: 121.40.109.122
port: 6379
password: chaozg123
timeout: 1000
database: 3
lettuce:
pool:
min-idle: 0
max-idle: 8
max-wait: -1ms
max-active: 16
cloud:
nacos:
discovery:
server-addr: 121.40.109.122:8848
namespace: 237e1905-0a66-4375-9bb6-a51c3c034aca
dubbo:
application:
name: system-server
qos-port: 22253
qos-enable: true
registry:
address: nacos://121.40.109.122:8848 # Nacos 服务地址
group: server-prod
protocol:
port: 10403
threads: 20
name: dubbo
serialization: hessian2
seata:
application-id: system-server
tx-service-group: group_seata
config:
type: nacos
nacos:
server-addr: 121.40.109.122:8848
namespace:
group: group_seata

4
cash-service/order-service/src/main/java/com/czg/service/order/dto/VipPayParamDTO.java
View File

@ -25,6 +25,10 @@ public class VipPayParamDTO {
* 霸王餐使用 是否整单打包
*/
private Integer allPack;
/**
* 用户端 使用 全打包 或者 全不打包
*/
private Integer userAllPack;
@NotNull(message = "充值金额不为空")
private BigDecimal amount;

2
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
View File

@ -524,7 +524,7 @@ public class PayServiceImpl implements PayService {
//更新会员余额 并生成流水
shopUserService.updateMoney(shopUser.getShopId(), shopUserMoneyEditDTO);
userFlowService.updateRefund(inFlow.getId(), refPayParam.getRefAmount());
if (giftFlow != null && (giftFlow.getAmount().subtract(refPayParam.getRefAmount())).compareTo(BigDecimal.ZERO) > 0) {
if (giftFlow != null && (giftFlow.getAmount().subtract(giftFlow.getRefundAmount())).compareTo(BigDecimal.ZERO) > 0) {
ShopUserMoneyEditDTO giftFlowEdit = new ShopUserMoneyEditDTO()
.setId(shopUser.getId())
.setMoney(giftFlow.getAmount())

2
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopOrderStatisticServiceImpl.java
View File

@ -151,6 +151,8 @@ public class ShopOrderStatisticServiceImpl extends ServiceImpl<ShopOrderStatisti
}
statistic.setUpdateTime(LocalDateTime.now());
BeanUtil.copyProperties(info, statistic);
statistic.setShopId(shopId);
statistic.setCreateDay(LocalDate.now());
saveOrUpdate(statistic);
});