2024年10月17日23:03:12

blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/feign/PaymentClient.java

@@ -130,7 +130,7 @@ public class PaymentClient implements IPaymentClient {
 						resultObj.put("signType", AnalysisMapUtils.getString("signType", mapType));
 						resultObj.put("partnerid", AnalysisMapUtils.getString("cusid", map));
 						resultObj.put("prepayId", AnalysisMapUtils.getString("reqsn", map));
-						resultObj.put("chnltrxid", AnalysisMapUtils.getString("chnltrxid", map));
+//						resultObj.put("chnltrxid", AnalysisMapUtils.getString("chnltrxid", map));
 //						resultObj.put("chnltrxid", "");
 						String paySign = AnalysisMapUtils.getString("paySign", mapType);
 						resultObj.put("paySign", paySign);

blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/service/impl/PaymentServiceImpl.java

@@ -864,6 +864,7 @@ public class PaymentServiceImpl implements IPaymentService {
 						BigDecimal amount = new BigDecimal("0.00");
 						for (PjOrder selectOrder : re.getData()) {
 							selectOrder.setPaymentDate(new Date());
+							selectOrder.setChnltrxid(AnalysisMapUtils.getString("chnltrxid", params));
 							selectOrder.setActualPaymentStatus(2);
 							selectOrder.setPaymentAmountTl(selectOrder.getTotalMoney());
 							selectOrder.setStatus(OrderTypeEnum.XSDQR.getType());

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/impl/OrderServiceImpl.java

@@ -4079,7 +4079,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 			}
 		}
 		String stata = sysClient.getParamService("WeChat.shipping.notification");
-		if ("1".equals(stata)){
+		if ("1".equals(stata) && pjOrder.getBusinessSource().equals(OrderTypeEnum.XCX.getType())){
 			Parameters parameters = parametersService.getParametersOne();
 			if (ObjectUtils.isNull(parameters)) {
 				throw new SecurityException("未找到小程序信息");
@@ -4148,7 +4148,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 								System.err.println("发送发货通知返回objectShip内容：" + objectShip);
 								String status = objectShip.getString("errmsg");
 								if ("ok".equals(status)) {
-									return R.data("操作成功");
+									System.err.println("操作成功");
+									return R.data(pjOrder);
 								} else {
 									throw new RuntimeException("发送失败");
 								}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/payMethod/PayServiceImpl.java

@@ -150,7 +150,7 @@ public class PayServiceImpl implements PayService {
 						order.setActualPaymentStatus(1);
 //						order.setPaymentAmountTl(amount);
 						order.setOldTrxId(res.getData().get("trxid").toString());
-						order.setChnltrxid(res.getData().get("chnltrxid").toString());
+//						order.setChnltrxid(res.getData().get("chnltrxid").toString());
 						//更新订单表
 						orderMapper.updateById(order);
 					}