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

替换收银呗字样，更改创客错误状态,更改提现时手机号显示,分享注册，提现算法列表,后台推广员列表·

Browse Source
This commit is contained in:
liuyingfang
2023-07-18 15:34:44 +08:00
parent 542a1079a0
commit 0a7da333b2
13 changed files with 53 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pluss-api-page/src/main/resources/application-dev.yml
View File

@@ -1,17 +1,17 @@
spring: spring:
# datasource:
# url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
# username: chaozhanggui
# password: CZGmysqlroot@123
# driver-class-name: com.mysql.jdbc.Driver
datasource: datasource:
url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 url: jdbc:mysql://rm-bp19ib8x213kh9t450o.rwlb.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
username: chaozhanggui username: root
password: CZGmysqlroot@123 password: prodCZGmysqlroot@123
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver
# datasource: # datasource:
# url: jdbc:mysql://rm-bp19ib8x213kh9t450o.rwlb.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 # url: jdbc:mysql://101.37.12.135:3306/ysk_test?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
# username: root # username: ysk_test
# password: prodCZGmysqlroot@123
# driver-class-name: com.mysql.jdbc.Driver
# datasource:
# url: jdbc:mysql://60.205.224.68:3306/ysk_test?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
# username: root
# password: CZGmysqlroot@123 # password: CZGmysqlroot@123
# driver-class-name: com.mysql.jdbc.Driver # driver-class-name: com.mysql.jdbc.Driver
parameter: parameter:

2
pluss-api-page/src/main/resources/application-prod.yml
View File

@@ -1,6 +1,6 @@
spring: spring:
datasource: datasource:
url: jdbc:mysql://rm-bp19ib8x213kh9t45.rwlb.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 url: jdbc:mysql://rm-bp1uo9iq250st2e69.mysql.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
username: root username: root
password: prodCZGmysqlroot@123 password: prodCZGmysqlroot@123
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver

2
pluss-api-page/src/main/resources/application.yml
View File

@@ -5,7 +5,7 @@ spring:
profiles: profiles:
### 将一些固定的配置放到下级文件夹下的yml文件中 ### 将一些固定的配置放到下级文件夹下的yml文件中
include: common, ryx, ys include: common, ryx, ys
active: test active: dev
mvc: mvc:
view: view:
prefix: /WEB-INF/jsp/ prefix: /WEB-INF/jsp/

2
pluss-common-bundle/src/main/resources/config/application-common.yml
View File

@@ -87,7 +87,7 @@ spring:
username: admin username: admin
password: admin password: admin
host: 127.0.0.1 host: 127.0.0.1
port: 5672 port: 5673
parameter: parameter:

2
pluss-dao-bundle/src/main/resources/mapper/Cash-sqlmap.xml
View File

@@ -220,7 +220,6 @@
<select id="subordinate" parameterType="java.lang.Long" resultType="cn.pluss.platform.entity.Cash"> <select id="subordinate" parameterType="java.lang.Long" resultType="cn.pluss.platform.entity.Cash">
SELECT SELECT
IF( v.accountNo='', '', CONCAT(LEFT(v.accountNo, 3), '****', RIGHT(v.accountNo,4))) AS accountNo,
v.* v.*
FROM FROM
( (
@@ -243,6 +242,7 @@
<if test="status != null and status !=''"> <if test="status != null and status !=''">
AND v.status = #{status} AND v.status = #{status}
</if> </if>
ORDER BY v.id DESC
limit #{page},#{size} limit #{page},#{size}
</select> </select>
</mapper> </mapper>

22
pluss-manage-page/src/main/resources/application-dev.yml
View File

@@ -1,19 +1,25 @@
spring: spring:
datasource: # datasource:
druid: # druid:
url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8&noAccessToProcedureBodies=true&allowMultiQueries=true # url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8&noAccessToProcedureBodies=true&allowMultiQueries=true
username: root # username: root
password: CZGmysqlroot@123 # password: CZGmysqlroot@123
driver-class-name: com.mysql.jdbc.Driver # driver-class-name: com.mysql.jdbc.Driver
# datasource: # datasource:
# druid: # druid:
# url: jdbc:mysql://rm-bp19ib8x213kh9t450o.rwlb.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 # url: jdbc:mysql://rm-bp19ib8x213kh9t450o.rwlb.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
# username: root # username: root
# password: prodCZGmysqlroot@123 # password: prodCZGmysqlroot@123
# driver-class-name: com.mysql.jdbc.Driver # driver-class-name: com.mysql.jdbc.Driver
# #新
datasource:
url: jdbc:mysql://rm-bp1uo9iq250st2e691o.mysql.rds.aliyuncs.com.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
username: root
password: prodCZGmysqlroot@123
driver-class-name: com.mysql.jdbc.Driver
# datasource: # datasource:
# url: jdbc:mysql://60.205.224.68:3306/ysk_test?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 # url: jdbc:mysql://101.37.12.135:3306/ysk_test?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
# username: root # username: ysk_test
# password: CZGmysqlroot@123 # password: CZGmysqlroot@123
# driver-class-name: com.mysql.jdbc.Driver # driver-class-name: com.mysql.jdbc.Driver
logging: logging:

2
pluss-manage-page/src/main/resources/application-prod.yml
View File

@@ -7,7 +7,7 @@ spring:
# driver-class-name: com.mysql.jdbc.Driver # driver-class-name: com.mysql.jdbc.Driver
datasource: datasource:
druid: druid:
url: jdbc:mysql://rm-bp19ib8x213kh9t45.rwlb.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 url: jdbc:mysql://rm-bp1uo9iq250st2e69.mysql.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
username: root username: root
password: prodCZGmysqlroot@123 password: prodCZGmysqlroot@123
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver

2
pluss-manage-page/src/main/resources/application.yml
View File

@@ -1,7 +1,7 @@
spring: spring:
profiles: profiles:
include: common, ryx, ys include: common, ryx, ys
active: test active: prod
servlet: servlet:
multipart: multipart:
max-file-size: 100MB max-file-size: 100MB

4
pluss-service-bundle/src/main/java/cn/pluss/platform/bsj/conn/domain/CodeEnum.java
View File

@@ -26,8 +26,8 @@ public enum CodeEnum {
ORDER_REFUND_ERROR("2002", "订单退款异常"), ORDER_REFUND_ERROR("2002", "订单退款异常"),
PASSWORD_NOT_INIT("2011", "安全密码未初始化，请前往收银呗APP进行初始化"), PASSWORD_NOT_INIT("2011", "安全密码未初始化，请前往银收客APP进行初始化"),
PASSWORD_ERROR("2021", "安全密码错误，若忘记密码，可前往收银呗APP进行重置"), PASSWORD_ERROR("2021", "安全密码错误，若忘记密码，可前往银收客APP进行重置"),
; ;
private final String val; private final String val;

8
pluss-service-bundle/src/main/java/cn/pluss/platform/cash/impl/CashServiceImpl.java
View File

@@ -279,11 +279,11 @@ public class CashServiceImpl extends ServiceImpl<CashMapper, Cash> implements Ca
throw new MsgException("可提现金额不足！"); throw new MsgException("可提现金额不足！");
} }
cash.setRate(8); cash.setRate(10);
cash.setBaseServiceCharge(BigDecimal.valueOf(3)); cash.setBaseServiceCharge(BigDecimal.ZERO);
cash.setRatioCharge(cash.getCashAmt().multiply(BigDecimal.valueOf(0.08)).setScale(2, RoundingMode.HALF_EVEN)); cash.setRatioCharge(new BigDecimal("0.1"));
cash.setVirTotalCharge(cash.getBaseServiceCharge().add(cash.getRatioCharge())); cash.setVirTotalCharge(cash.getBaseServiceCharge().add(cash.getRatioCharge()));
cash.setVirRealCashAmt(cash.getCashAmt().subtract(cash.getVirTotalCharge()).setScale(2, RoundingMode.HALF_EVEN)); cash.setVirRealCashAmt(cash.getCashAmt().subtract(cash.getCashAmt().multiply(new BigDecimal("0.1"))).setScale(2, RoundingMode.HALF_EVEN));
return cash; return cash;
} }

11
pluss-wap-page/src/main/resources/application-dev.yml
View File

@@ -1,7 +1,12 @@
spring: spring:
# datasource:
# druid:
# url: jdbc:mysql://101.37.12.135:3306/ysk_test?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
# username: ysk_test
# password: CZGmysqlroot@123
# driver-class-name: com.mysql.jdbc.Driver
datasource: datasource:
druid: url: jdbc:mysql://rm-bp19ib8x213kh9t450o.rwlb.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
username: root username: root
password: CZGmysqlroot@123 password: prodCZGmysqlroot@123
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver

2
pluss-wap-page/src/main/resources/application-prod.yml
View File

@@ -1,7 +1,7 @@
spring: spring:
datasource: datasource:
druid: druid:
url: jdbc:mysql://rm-bp19ib8x213kh9t45.rwlb.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 url: jdbc:mysql://rm-bp1uo9iq250st2e69.mysql.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
username: root username: root
password: prodCZGmysqlroot@123 password: prodCZGmysqlroot@123
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver

10
pluss-wap-page/src/main/resources/application.yml
View File

@@ -9,7 +9,7 @@ spring:
allow-bean-definition-overriding: true allow-bean-definition-overriding: true
profiles: profiles:
include: common, ryx, ys include: common, ryx, ys
active: test active: prod
datasource: datasource:
url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8 url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
username: root username: root
@@ -30,10 +30,10 @@ spring:
resources: resources:
static-locations: classpath:/static static-locations: classpath:/static
rabbitmq: rabbitmq:
username: username: admin
password: password: admin
host: host: 127.0.0.1
port: 5672 port: 5673
jpush: jpush:
environment: environment: