合并话费修改

hai-bweb/src/main/java/com/bweb/controller/OutRechargePriceController.java

@@ -8,6 +8,7 @@ import com.hai.common.exception.ErrorHelp;
 import com.hai.common.exception.SysCode;
 import com.hai.common.security.SessionObject;
 import com.hai.common.security.UserCenter;
+import com.hai.common.utils.PageUtil;
 import com.hai.common.utils.ResponseMsgUtil;
 import com.hai.config.RechargeConfig;
 import com.hai.entity.BsOperationLog;
@@ -79,8 +80,6 @@ public class OutRechargePriceController {
 
             map.put("companyId", String.valueOf(userInfoModel.getBsCompany().getId()));
 
-            PageHelper.startPage(pageNum, pageSize);
-
             List<OutRechargePrice> outRechargePrices = outRechargePriceService.getListRechargePrice(map);
 
             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) {
             log.error("OutRechargePriceController --> getListUser() error!", e);
             return ResponseMsgUtil.exception(e);

hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java

@@ -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) {
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "订单最大抵扣积分金额：" + maxIntegralDeductionPrice);

hai-service/src/main/resources/pre/commonConfig.properties

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

hai-service/src/main/resources/prod-9401/commonConfig.properties

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

hai-service/src/main/resources/prod/commonConfig.properties

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

v1/target/classes/application.yml

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