fix

netflix-dao/src/main/resources/mapper/StatisticsExportMapper.xml

@@ -72,7 +72,7 @@
     </select>
 
     <select id="getMonthAiExNumOfUser" resultType="java.lang.Integer">
-        select count(distinct buyer_id)
+        select count(distinct user_id)
         from `order_don` od
         where status not in ('close','noPayment')
         and (refund_money is null or refund_money != money)
@@ -84,7 +84,7 @@
     </select>
 
     <select id="getMonthAiExNumOfUserByType" resultType="java.lang.Integer">
-        select count(distinct buyer_id) from (select buyer_id
+        select count(distinct user_id) from (select user_id
         from `order_don` od
         where status not in ('close','noPayment')
         and (refund_money is null or refund_money != money)
@@ -98,7 +98,7 @@
         and (refund_money is null or refund_money != money)
         and created_time between #{thisMonth} and #{nextMonth}
         and order_type = #{type}
-        and buyer_id = s.buyer_id
+        and user_id = s.user_id
         and sku_id in
         <foreach collection="skuIds" item="item" open="(" separator="," close=")">
             #{item}
@@ -107,7 +107,7 @@
     </select>
 
     <select id="getMonthAiRenewNumOfUser" resultType="java.lang.Integer">
-        select count(distinct buyer_id)
+        select count(distinct user_id)
         from `order_don` od
         where status not in ('close','noPayment')
         and (refund_money is null or refund_money != money)

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

@@ -1078,8 +1078,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		String transactionId = params.get("trade_no");
 		String payTimeStr = params.get("gmt_payment");
 		//买家支付宝账号
-		String buyerId = params.get("buyer_id");
-		String buyerOpenId = params.get("buyer_open_id");
+		String buyerId = Optional.ofNullable(params.get("buyer_id")).orElse(params.get("buyer_open_id"));
 		log.info("支付宝回调信息:{}", Jsons.toJson(params));
 		if (!orderDon.getStatus().equals(OrderDon.Status.noPayment) && !orderDon.getStatus().equals(OrderDon.Status.close)) {
 			log.info("支付宝已回调，重复修改状态 id:{}", orderDon.getId());
@@ -1103,8 +1102,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		orderDon.setPayTime(payTime);
 		orderDon.setShopId(appId);
 		orderDon.setType(OrderDon.Type.ALI_PAY);
-
-		orderDon.setBuyerId(buyerOpenId);
+		orderDon.setBuyerId(buyerId);
 		//该支付账号id 是否被后台拉黑
 		Integer count1 = userPayOrderBlockMapper.selectCount(Wrappers.lambdaQuery(UserPayOrderBlock.class)
 				.eq(UserPayOrderBlock::getBuyerId, buyerId));
@@ -3317,7 +3315,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		String transactionId = params.get("trade_no");
 		String payTimeStr = params.get("gmt_payment");
 		//买家支付宝账号
-		String buyerId = params.get("buyer_id");
+		String buyerId = Optional.ofNullable(params.get("buyer_id")).orElse(params.get("buyer_open_id"));
 		log.info("支付宝回调信息:{}", Jsons.toJson(params));
 		if (!orderDon.getStatus().equals(UpgradeOrderDon.Status.noPayment) && !orderDon.getStatus().equals(UpgradeOrderDon.Status.close)) {
 			log.info("支付宝已回调，重复修改状态 id:{}", orderDon.getId());

netflix-service/src/main/java/com/cyksj/service/user/impl/UserPayOrderBlockServiceImpl.java

@@ -17,6 +17,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Optional;
 
 /**
  * 项目名: yhlxj
@@ -57,7 +58,7 @@ public class UserPayOrderBlockServiceImpl extends ServiceImpl<UserPayOrderBlockM
 				if (orderDon.getType() == OrderDon.Type.ALI_PAY) {
 					AlipayTradeQueryResponse zfbOrderDetail = orderDonService.getZfbOrderDetail(orderDon.getShopId(), orderDon.getOrderNo());
 					if (zfbOrderDetail != null) {
-						buyerId = zfbOrderDetail.getBuyerUserId();
+						buyerId = Optional.ofNullable(zfbOrderDetail.getBuyerUserId()).orElse(zfbOrderDetail.getBuyerOpenId());
 					}
 				}
 			}