hurui
/
hai-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并话费修改

Browse Source
dev-discount
袁野 3 years ago
parent b25f98be4e
commit c2853a33d6
9 changed files with 101 additions and 83 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 5
      hai-bweb/src/main/java/com/bweb/controller/OutRechargePriceController.java
  2. 4
      hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
  3. 48
      hai-service/src/main/resources/pre/commonConfig.properties
  4. 6
      hai-service/src/main/resources/prod-9401/commonConfig.properties
  5. 3
      hai-service/src/main/resources/prod/commonConfig.properties
  6. 28
      v1/target/classes/application.yml
  7. BIN
      v1/target/hai-v1-1.0-SNAPSHOT.jar
  8. BIN
      v1/target/hai-v1-1.0-SNAPSHOT.jar.original

5
hai-bweb/src/main/java/com/bweb/controller/OutRechargePriceController.java
Unescape View File

@ -8,6 +8,7 @@ import com.hai.common.exception.ErrorHelp;
import com.hai.common.exception.SysCode; import com.hai.common.exception.SysCode;
import com.hai.common.security.SessionObject; import com.hai.common.security.SessionObject;
import com.hai.common.security.UserCenter; import com.hai.common.security.UserCenter;
import com.hai.common.utils.PageUtil;
import com.hai.common.utils.ResponseMsgUtil; import com.hai.common.utils.ResponseMsgUtil;
import com.hai.config.RechargeConfig; import com.hai.config.RechargeConfig;
import com.hai.entity.BsOperationLog; import com.hai.entity.BsOperationLog;
@ -79,8 +80,6 @@ public class OutRechargePriceController {
map.put("companyId", String.valueOf(userInfoModel.getBsCompany().getId())); map.put("companyId", String.valueOf(userInfoModel.getBsCompany().getId()));
PageHelper.startPage(pageNum, pageSize);
List<OutRechargePrice> outRechargePrices = outRechargePriceService.getListRechargePrice(map); List<OutRechargePrice> outRechargePrices = outRechargePriceService.getListRechargePrice(map);
Map<String, Object> listMap; Map<String, Object> listMap;
@ -101,7 +100,7 @@ public class OutRechargePriceController {
} }
return ResponseMsgUtil.success(new PageInfo<>(outRechargePriceModelList)); return ResponseMsgUtil.success(PageUtil.initPageInfoObj(pageNum,outRechargePriceModelList.size(),pageSize,new PageInfo<>(outRechargePriceModelList)));
} catch (Exception e) { } catch (Exception e) {
log.error("OutRechargePriceController --> getListUser() error!", e); log.error("OutRechargePriceController --> getListUser() error!", e);
return ResponseMsgUtil.exception(e); return ResponseMsgUtil.exception(e);

4
hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
Unescape View File

@ -257,9 +257,9 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
} }
// 积分抵扣金额 // 积分抵扣金额
BigDecimal integralDeductionPrice = object.getBigDecimal("integralNum").divide(new BigDecimal(100).setScale(2, RoundingMode.HALF_DOWN)); BigDecimal integralDeductionPrice = object.getBigDecimal("integralNum").divide(new BigDecimal(100).setScale(2, RoundingMode.HALF_UP));
// 最高可抵扣金额 // 最高可抵扣金额
BigDecimal maxIntegralDeductionPrice = outRechargeOrder.getPayRealPrice().multiply(bsProductDiscount.getDiscount()).divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_DOWN); BigDecimal maxIntegralDeductionPrice = outRechargeOrder.getPayRealPrice().multiply(bsProductDiscount.getDiscount()).divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_UP);
// 判读积分是否大于限制额度 // 判读积分是否大于限制额度
if (maxIntegralDeductionPrice.compareTo(integralDeductionPrice) < 0) { if (maxIntegralDeductionPrice.compareTo(integralDeductionPrice) < 0) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "订单最大抵扣积分金额：" + maxIntegralDeductionPrice); throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "订单最大抵扣积分金额：" + maxIntegralDeductionPrice);

48
hai-service/src/main/resources/pre/commonConfig.properties
Unescape View File

@ -1,16 +1,20 @@
hsgDomainName=https://hsgcs.dctpay.com hsgDomainName=https://hsg.dctpay.com
tuanYouUrl=https://hcs.czb365.com tuanYouUrl=https://hcs.czb365.com
tuanYouAppKey=210091174083104 tuanYouAppKey=210091174083104
tuanYouAppSecret=f9811df6791d309bf48f4a8db9edaa45 tuanYouAppSecret=f9811df6791d309bf48f4a8db9edaa45
tuanYouDieselAccount=9hp52qgg4400 tuanYouDieselAccount=9hp52qgg4400
tuanYouGasolineAccount=9hp52qf04400 tuanYouGasolineAccount=9hp52qf04400
# tuanYouAppKey=232373843366592
# tuanYouAppSecret=b07cca748a3b83e27e4821d2a8423d91
# tuanYouDieselAccount=c2qitcag4400
# tuanYouGasolineAccount=c2qitc984400
qinzhuUrl=https://live.qianzhu8.com qinzhuUrl=https://live.qianzhu8.com
qinzhuHtmlUrl=https://qz.dctpay.com qinzhuHtmlUrl=https://qz.dctpay.com
qinzhuPlatformId=10458 qinzhuPlatformId=10458
qinzhuSecret=nnl3gg4ss0pka11t qinzhuSecret=nnl3gg4ss0pka11t
qianzhuOrderNotify=https://hsgcs.dctpay.com/crest/qianzhu/orderNotify qianzhuOrderNotify=https://hsg.dctpay.com/crest/qianzhu/orderNotify
huiliantongUrl=https://gzapi.deepermobile.com.cn huiliantongUrl=https://gzapi.deepermobile.com.cn
huiliantongAppNo=guizhouhuilt huiliantongAppNo=guizhouhuilt
@ -24,20 +28,19 @@ HuiLianTongUnionCardSignCode=F8E91A3C
HltMembershipLevelAccessCode = 9766699A55D640BB97FD8674CF13CCB4 HltMembershipLevelAccessCode = 9766699A55D640BB97FD8674CF13CCB4
HltMembershipLevelSignCode = C9B28C9A HltMembershipLevelSignCode = C9B28C9A
unionPayUrl=https://notify-test.eycard.cn:7443/WorthTech_Access_AppPaySystemV2/apppayacc unionPayUrl=https://open.eycard.cn:8443/WorthTech_Access_AppPaySystemV2/apppayacc
unionPayChannelid=D01X66666666761 unionPayChannelid=D01X00000801226
unionPayMerid=531000012972390 unionPayMerid=83169055983W000
unionPayTermid=W1489519 unionPayTermid=XS000103
unionPaySignKey=sa72ivadl84273dlj2kdaia2idiadik5 unionPaySignKey=1dfk0i0fl7ild07l2k5oj8dddikkivd0
unionPayNotifyUrl=https://hsg.dctpay.com/crest/unionPay/notify unionPayNotifyUrl=https://hsg.dctpay.com/crest/unionPay/notify
unionPayTelNotifyUrl=https://hsg.dctpay.com/crest/unionPay/notifyTel unionPayTelNotifyUrl=https://hsg.dctpay.com/crest/unionPay/notifyTel
unionStagingPayUrl=https://mtest.eycard.cn/ unionStagingPayUrl=https://cashier.eycard.cn:8663/
unionStagingPayOrgId=ORG000000000001 unionStagingPayOrgId=ORG000000000009
unionStagingPayOrgMerCode=890000000123679 unionStagingPayOrgMerCode=531000009798708
unionStagingPayOrgTermNo=W0616228 unionStagingPayOrgTermNo=39666304
unionStagingPaySignKey=1dfk0i0fl7ild07l2k5oj8dddikkivd0 unionStagingPayNotifyUrl=https://hsg.dctpay.com/crest/unionPay/stagingNotify
unionStagingPayNotifyUrl=https://hsgcs.dctpay.com/crest/unionPay/stagingNotify
wx_cert=/home/project/wx_cert/ wx_cert=/home/project/wx_cert/
@ -45,19 +48,18 @@ TelApiKey=2d01f6b520254b1a80f6b167832cea18
TelApiSecret=d11ee9b41e014a039f030e53ae6f5295 TelApiSecret=d11ee9b41e014a039f030e53ae6f5295
TelMemberId=d13091df65d64aafbf0f35d2093157b7 TelMemberId=d13091df65d64aafbf0f35d2093157b7
// Mobile
unionAppId=7113783e75354df2a985efd3f31b9528
unionSecret=e2c731d2a026469aa6d218432f361653
unionRsaKey=891f6775fba7f12cc23df7c75e02b39b891f6775fba7f12c
# Jj
JjNotifyUrl = https://hsgcs.dctpay.com/crest/czOrder/rechargeCallbackByJj JjNotifyUrl = https://hsgcs.dctpay.com/crest/czOrder/rechargeCallbackByJj
JjAppKey = eaomqcbpdz7yjfih JjAppKey = p429mlj3cvn5hb07
JjUrl = https://hfcs.dmjvip.com/index.php/third/mobile/ JjUrl = https://jj.dmjvip.com/index.php/third/mobile/
JjAppSecret = xkf9eoq2cjh6uvzp0mtrga134lnibdw8 JjAppSecret = bf57pnqy8mkexr0v169c3g4odazwu2ij
#LY #LY
LyNotifyUrl = https://hsgcs.dctpay.com/crest/czOrder/rechargeCallbackByLy LyNotifyUrl = httpscs://hsg.dctpay.com/crest/czOrder/rechargeCallbackByLy
LyApiKey=CMdyxh2gJ7tbXc6rS0KADqPIfVpaQLjU LyApiKey=CMdyxh2gJ7tbXc6rS0KADqPIfVpaQLjU
LyMemberId=18665 LyMemberId=18665
LyPostUrl=https://cz.31994.cn/yrapi.php/ LyPostUrl=https://cz.31994.cn/yrapi.php/
unionAppId=ced46392acfe42be863fdfdd3e61164a
unionSecret=a0f380bb22cd4ce2a8d35f3bf437d6fa
unionRsaKey=f2e6b6b95da445866194498c371a7c8af2e6b6b95da44586

6
hai-service/src/main/resources/prod-9401/commonConfig.properties
Unescape View File

@ -48,16 +48,14 @@ TelApiKey=2d01f6b520254b1a80f6b167832cea18
TelApiSecret=d11ee9b41e014a039f030e53ae6f5295 TelApiSecret=d11ee9b41e014a039f030e53ae6f5295
TelMemberId=d13091df65d64aafbf0f35d2093157b7 TelMemberId=d13091df65d64aafbf0f35d2093157b7
CzNotifyUrl = https://hsg.dctpay.com/crest/czOrder/rechargeCallback
// Mobile // Mobile
JjNotifyUrl = https://hsg.dctpay.com/crest/czOrder/rechargeCallback JjNotifyUrl = https://hsg.dctpay.com/crest/czOrder/rechargeCallbackByJj
JjAppKey = p429mlj3cvn5hb07 JjAppKey = p429mlj3cvn5hb07
JjUrl = https://jj.dmjvip.com/index.php/third/mobile/ JjUrl = https://jj.dmjvip.com/index.php/third/mobile/
JjAppSecret = bf57pnqy8mkexr0v169c3g4odazwu2ij JjAppSecret = bf57pnqy8mkexr0v169c3g4odazwu2ij
#LY #LY
LyNotifyUrl = https://hsg.dctpay.com/crest/czOrder/rechargeCallbackByLy
LyApiKey=CMdyxh2gJ7tbXc6rS0KADqPIfVpaQLjU LyApiKey=CMdyxh2gJ7tbXc6rS0KADqPIfVpaQLjU
LyMemberId=18665 LyMemberId=18665
LyPostUrl=https://cz.31994.cn/yrapi.php/ LyPostUrl=https://cz.31994.cn/yrapi.php/

3
hai-service/src/main/resources/prod/commonConfig.properties
Unescape View File

@ -49,12 +49,13 @@ TelApiSecret=d11ee9b41e014a039f030e53ae6f5295
TelMemberId=d13091df65d64aafbf0f35d2093157b7 TelMemberId=d13091df65d64aafbf0f35d2093157b7
// Mobile // Mobile
JjNotifyUrl = https://hsg.dctpay.com/crest/czOrder/rechargeCallback JjNotifyUrl = https://hsg.dctpay.com/crest/czOrder/rechargeCallbackByJj
JjAppKey = p429mlj3cvn5hb07 JjAppKey = p429mlj3cvn5hb07
JjUrl = https://jj.dmjvip.com/index.php/third/mobile/ JjUrl = https://jj.dmjvip.com/index.php/third/mobile/
JjAppSecret = bf57pnqy8mkexr0v169c3g4odazwu2ij JjAppSecret = bf57pnqy8mkexr0v169c3g4odazwu2ij
#LY #LY
LyNotifyUrl = https://hsg.dctpay.com/crest/czOrder/rechargeCallbackByLy
LyApiKey=CMdyxh2gJ7tbXc6rS0KADqPIfVpaQLjU LyApiKey=CMdyxh2gJ7tbXc6rS0KADqPIfVpaQLjU
LyMemberId=18665 LyMemberId=18665
LyPostUrl=https://cz.31994.cn/yrapi.php/ LyPostUrl=https://cz.31994.cn/yrapi.php/

28
v1/target/classes/application.yml
Unescape View File

@ -9,9 +9,9 @@ debug: false
#datasource数据源设置 #datasource数据源设置
spring: spring:
datasource: datasource:
url: jdbc:mysql://122.9.135.148:3306/hsg?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false url: jdbc:mysql://192.168.0.63:21100/hsg?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
username: root username: hsg
password: HF123456. password: HUfukeji123456!@#
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver
filters: stat filters: stat
@ -28,8 +28,8 @@ spring:
poolPreparedStatements: true poolPreparedStatements: true
maxOpenPreparedStatements: 20 maxOpenPreparedStatements: 20
redis: redis:
database: 1 database: 0
host: 139.159.177.244 host: 127.0.0.1
port: 36379 port: 36379
password: HF123456.Redis password: HF123456.Redis
timeout: 1000 timeout: 1000
@ -39,10 +39,28 @@ spring:
max-wait: -1 max-wait: -1
max-idle: 10 max-idle: 10
min-idle: 0 min-idle: 0
#thymelea模板配置
thymeleaf:
prefix: classpath:/templates/
suffix: .html
mode: HTML5
encoding: UTF-8
#热部署文件，页面不产生缓存，及时更新
cache: false
#配置日期返回至前台为时间戳 #配置日期返回至前台为时间戳
jackson: jackson:
serialization: serialization:
write-dates-as-timestamps: true write-dates-as-timestamps: true
thymeleaf:
cache: false
prefix: classpath:/templates/
suffix: .html
encoding: UTF-8
content-type: text/html
mode: HTML5
mybatis: mybatis:
mapperLocations: mapperLocations:
- classpath*:sqlmap*/*.xml - classpath*:sqlmap*/*.xml

BIN
v1/target/hai-v1-1.0-SNAPSHOT.jar
View File

Binary file not shown.

BIN
v1/target/hai-v1-1.0-SNAPSHOT.jar.original
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save