fix

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -1900,7 +1900,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 				if (points != null && points.compareTo(BigDecimal.ZERO) > 0) {
 					log.info("用户{}邀请{},产生分销订单分发积分记录入库", userDistributeShared.getSharedId(), order.getUserId());
 					distributeWaitingSendPoints.setSendStatus(DistributeWaitingSendPoints.Status.waiting);
-					distributeWaitingSendPoints.setSendTime(DateUtil.offsetDay(order.getPayTime(), 3));
+					distributeWaitingSendPoints.setSendTime(DateUtil.offsetDay(DateTime.now(), 3));
 					distributeWaitingSendPoints.setRate(rate);
 					distributeWaitingSendPointsMapper.insert(distributeWaitingSendPoints);
 					//暂定虚物 商务可首单提成
@@ -2248,6 +2248,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 						List<OrderDon> orderDonlist = this.list(Wrappers.lambdaQuery(OrderDon.class)
 								.eq(OrderDon::getMOid, orderMasterDon.getId()));
 						orderMasterDon.setTransactionId(reMap.get("transaction_id"));
+						orderMasterDon.setPayTime(DateUtil.parse(reMap.get("time_end"), "yyyyMMddHHmmss"));
 						orderDonlist.forEach(orderDon -> {
 							GoodsDon goodsDon = goodsDonMapper.selectById(orderDon.getGoodsId());
 							orderDon.setStatus(goodsDon.getType() == 1 && goodsDon.getSecondType() == 2 ? OrderDon.Status.complete : OrderDon.Status.hasPayment);
@@ -2269,6 +2270,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 					String tradeStatus = zfbOrderDetail.getTradeStatus();
 					if ("TRADE_SUCCESS".equals(tradeStatus)) {
 						orderMasterDon.setTransactionId(zfbOrderDetail.getTradeNo());
+						orderMasterDon.setPayTime(zfbOrderDetail.getSendPayDate());
 						List<OrderDon> orderDonlist = this.list(Wrappers.lambdaQuery(OrderDon.class)
 								.eq(OrderDon::getMOid, orderMasterDon.getId()));
 						orderDonlist.forEach(orderDon -> {

netflix-service/src/main/java/com/cyksj/service/shop/impl/YhShopDistributeServiceImpl.java

@@ -1,5 +1,6 @@
 package com.cyksj.service.shop.impl;
 
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cyksj.mapper.GoodsDonMapper;
@@ -94,7 +95,7 @@ public class YhShopDistributeServiceImpl implements YhShopDistributeService {
 		returnMoney = orderMoney.multiply(BigDecimal.valueOf(rate)).divide(BigDecimal.valueOf(100));
 		distributeWaitingSendPoints.setMoney(returnMoney);
 		distributeWaitingSendPoints.setSendStatus(YhShopDistributeWaitingSendPoints.Status.waiting);
-		distributeWaitingSendPoints.setSendTime(DateUtil.offsetDay(order.getPayTime(), 3));
+		distributeWaitingSendPoints.setSendTime(DateUtil.offsetDay(DateTime.now(), 3));
 		distributeWaitingSendPoints.setRate(rate);
 		distributeWaitingSendPoints.setSkuId(order.getSkuId());
 		yhShopDistributeWaitingSendPointsMapper.insert(distributeWaitingSendPoints);