回调问题处理

ldt-core/pom.xml

@@ -16,12 +16,12 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-core-boot</artifactId>
-<!--            <exclusions>-->
-<!--                <exclusion>-->
-<!--                    <groupId>org.springblade</groupId>-->
-<!--                    <artifactId>blade-core-cloud</artifactId>-->
-<!--                </exclusion>-->
-<!--            </exclusions>-->
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springblade</groupId>
+                    <artifactId>blade-core-cloud</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>

ldt-core/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java

@@ -37,8 +37,10 @@ public class LauncherServiceImpl implements LauncherService {
 		Properties props = System.getProperties();
 		PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile));
 		PropsUtil.setProperty(props, "spring.datasource.dynamic.enabled", "false");
-		// 开启elk日志
-		//PropsUtil.setProperty(props, "blade.log.elk.destination", LauncherConstant.elkAddr(profile));
+//		// 开启elk日志
+//		//PropsUtil.setProperty(props, "blade.log.elk.destination", LauncherConstant.elkAddr(profile));
+//		PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.server-addr", LauncherConstant.nacosAddr(profile));
+//		PropsUtil.setProperty(props, "spring.cloud.nacos.config.server-addr", LauncherConstant.nacosAddr(profile));
 	}
 
 }

ldt-core/src/main/java/org/springblade/ldt/bills/entity/Bills.java

@@ -182,4 +182,6 @@ public class Bills extends TenantEntity {
 	@ApiModelProperty(value = "实际到账")
 	private BigDecimal actualIncome;
 
+
+	private boolean csFlag;
 }

ldt-core/src/main/java/org/springblade/payment/callback/trade/UserPayCS.java

@@ -93,7 +93,7 @@ public class UserPayCS {
 				LoginUser user = loginUserService.getById(successParams.getBills().getPayId());
 				Bills bills = billsService.getById(successParams.getBills().getId());
 				//回调已处理，忽略后续回调
-				if (!Objects.equals(bills.getPayStatus(), AppConstant.BillPayStatus.付款成功.name())) {
+				if (!bills.isCsFlag()) {
 					return;
 				}
 
@@ -141,7 +141,8 @@ public class UserPayCS {
 				UserChannelPoint channelPoint = (UserChannelPoint) tenantEntities.get(1);
 				pointBills = (PointBills) tenantEntities.get(0);
 				balanceBills = handleBalanceBills(balanceBills, user);
-				bills.setPayStatus(AppConstant.BillPayStatus.已完结.name());
+//				bills.setPayStatus(AppConstant.BillPayStatus.已完结.name());
+				bills.setCsFlag(true);
 				Shop shop = updateShopBalance(bills, ypSettleAmount);
 
 				List<TenantEntity> handleSendPointBills = handleSendPointBills(channelPoint, bills, user);

ldt-core/src/main/java/org/springblade/payment/callback/trade/UserPayCallback.java

@@ -102,7 +102,7 @@ public class UserPayCallback {
 				.build();
 			YopResponse yopResponse = yeepaySaasService.tradeOrderQuery(tradeOrderQueryDto);
 			JSONObject orderInfo = JSON.parseObject(yopResponse.getStringResult());
-			bills.setPayStatus(AppConstant.BillPayStatus.已完结.name());
+			bills.setPayStatus(AppConstant.BillPayStatus.付款成功.name());
 
 			BigDecimal merchantFee = orderInfo.getBigDecimal("merchantFee");
 			BigDecimal ypSettleAmount = orderInfo.getBigDecimal("realPayAmount").subtract(merchantFee);

ldt-core/src/main/java/org/springblade/payment/handle/Trade.java

@@ -200,6 +200,7 @@ public class Trade {
 		bills.setPayScene(PaymentScene.MINI_PROGRAM.name());
 		bills.setMallId(order.getMallId());
 		bills.setTenantId(tenantId);
+		bills.setCsFlag(false);
 		bills.setTotalPrice(order.getMoney());
 		Assert.isTrue(dataHandle.saveOrUpdateEntity(billsService, bills), () -> {
 			throw new ServiceException(ResCode.TRADE_ERROR);

ldt-core/src/main/resources/wxConfig.properties

@@ -41,6 +41,7 @@ wx.common.businessUrls[1] = http://img.yeepay.com/
 wx.official.tradeAuthDirList[0] = https://ldt.guosen-fumao.cn/
 wx.official.tradeAuthDirList[1] = https://cash.yeepay.com/newwap/
 wx.official.tradeAuthDirList[2] = https://shouyin.yeepay.com/nc-cashier-wap/
+
 #公众号
 wx.official.appId = wxd84c9cf56b4d69ef
 wx.official.appSecret = 544c77d678a34c5a50d32e5710eff92e