2 Комити 33efeaeead ... 3d56f39b07

Аутор SHA1 Порука Датум
  guomengjiao 3d56f39b07 微信移动端支付 пре 4 месеци
  guomengjiao b7038dca02 微信移动端支付 пре 4 месеци

+ 1 - 1
modules/bjflapi/src/main/java/com/jeesite/modules/bjflapi/report/WebsiteUserOrderControllerApi.java

@@ -157,7 +157,7 @@ public class WebsiteUserOrderControllerApi extends AbstractController {
         if (Constants.enableType.NO.equals(researchBriefReport.getUseDownPay())) {
             return R.fail("简报不需要收费");
         }
-        if (!websiteUserOrder.getPayPrice().equals(researchBriefReport.getUseDownPayPrice())) {
+        if (websiteUserOrder.getPayPrice().compareTo(researchBriefReport.getUseDownPayPrice()) != 0) {
             return R.fail("支付金额与简报收费金额不一致");
         }
         WebsiteUserOrder orderWhere = new WebsiteUserOrder();

+ 1 - 1
modules/report/src/main/java/com/jeesite/modules/report/service/WebsiteUserOrderService.java

@@ -232,7 +232,7 @@ public class WebsiteUserOrderService extends CrudService<WebsiteUserOrderDao, We
 		if (websiteUserOrder == null) {
 			logger.error("payAsyncNotify error {}订单不存在未支付", out_trade_no);
 		} else {
-			if (!total_amount.equals(websiteUserOrder.getPayPrice().toString())) {
+			if (new BigDecimal(total_amount).compareTo(websiteUserOrder.getPayPrice()) != 0) {
 				logger.error("payAsyncNotify amount不相等 {} {}", total_amount, websiteUserOrder.getPayPrice().toString());
 				return "failure";
 			}

+ 2 - 2
web/src/main/resources/config/application.yml

@@ -54,7 +54,7 @@ jdbc:
   # Mysql 数据库配置
   type: mysql
   driver: com.mysql.cj.jdbc.Driver
-  url: jdbc:mysql://192.168.37.132:3306/bjfl_config?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+  url: jdbc:mysql://192.168.0.132:3306/bjfl_config?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
   username: root
   password: songlanyun
   testSql: SELECT 1
@@ -159,7 +159,7 @@ jdbc:
   ds02:
     type: mysql
     driver: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.37.132:3306/bjfl_portal?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&allowMultiQueries=true
+    url: jdbc:mysql://192.168.0.132:3306/bjfl_portal?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&allowMultiQueries=true
     username: root
     password: songlanyun
     testSql: SELECT 1