fix facebook回传

netflix-service/src/main/java/com/cyksj/service/order/OrderDonPostService.java

@@ -1,5 +1,7 @@
 package com.cyksj.service.order;
 
+import java.math.BigDecimal;
+
 /**
  * @author chan
  * @date 2023/5/16 11:05 AM
@@ -7,5 +9,5 @@ package com.cyksj.service.order;
 public interface OrderDonPostService {
     void postData(Long orderId) throws Exception;
 
-    void savePostData(Long orderId, String ip, String userAgent,String callback, String callbackType);
+    void savePostData(Long orderId, BigDecimal money,String currency,String ip, String userAgent, String callback, String callbackType);
 }

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

@@ -9,6 +9,7 @@ import com.cyksj.service.order.OrderDonPostService;
 import com.cyksj.service.order.post.AbstractPostDataService;
 import com.cyksj.service.order.post.PostDataFactory;
 import com.facebook.ads.sdk.serverside.ActionSource;
+import com.facebook.ads.sdk.serverside.CustomData;
 import com.facebook.ads.sdk.serverside.Event;
 import com.facebook.ads.sdk.serverside.UserData;
 import lombok.extern.slf4j.Slf4j;
@@ -16,6 +17,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 
+import java.math.BigDecimal;
+
 /**
  * @author chan
  * @date 2023/5/16 11:05 AM
@@ -35,7 +38,7 @@ public class OrderDonPostServiceImpl extends ServiceImpl<OrderDonPostMapper, Ord
     }
 
     @Override
-    public void savePostData(Long orderId,String ip, String userAgent, String callback, String callbackType) {
+    public void savePostData(Long orderId, BigDecimal money, String currency, String ip, String userAgent, String callback, String callbackType) {
         if (OrderDonPost.Type.verify(callbackType) && StringUtils.isNotBlank(callback)) {
             log.info("订单数据回传添加记录:{},type:{}", orderId, callbackType);
             OrderDonPost.Type byType = OrderDonPost.Type.getByType(callbackType);
@@ -44,12 +47,16 @@ public class OrderDonPostServiceImpl extends ServiceImpl<OrderDonPostMapper, Ord
                 Event event = new Event();
                 UserData userData = new UserData();
                 event.setEventId(orderId.toString());
-                event.setEventName("Donate");
+                event.setEventName("Purchase");
                 event.setEventTime(System.currentTimeMillis()/1000);
                 event.setActionSource(ActionSource.website);
                 userData.setClientUserAgent(userAgent);
                 userData.setClientIpAddress(ip);
                 event.setUserData(userData);
+                CustomData customData = new CustomData();
+                customData.setCurrency(currency);
+                customData.setValue(money.floatValue());
+                event.setCustomData(customData);
                 callback = JSONUtil.toJsonStr(event);
             }
             this.save(new OrderDonPost().setCallback(callback).setEvenType(byType.getEvenType()).setOrderId(orderId).setType(byType));

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

@@ -382,7 +382,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		String userAgent = request.getHeader(Header.USER_AGENT.toString());
 		//数据回传
 		if (StringUtils.isNotBlank(payRequest.getCallback())) {
-			orderDonPostService.savePostData(orderDon.getId(),clientIp,userAgent, payRequest.getCallback(), payRequest.getCallbackType());
+			orderDonPostService.savePostData(orderDon.getId(), orderDon.getMoney(),orderDon.getCurrency(),clientIp,userAgent, payRequest.getCallback(), payRequest.getCallbackType());
 		}
 		//无回传前端传入 查询缓存中用户的回传信息
 		if (StringUtils.isEmpty(payRequest.getCallback())) {
@@ -392,7 +392,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 					Optional.ofNullable(Jsons.parseObject(val, OrderDonPostDataDto.class))
 							.ifPresent(orderDonPostDataDto -> {
 								log.info("用户ID:{}预下单 回传用户缓存 订单回传记录保存,callback:{},callbackType:{}", orderDon.getUserId(), orderDonPostDataDto.getCallback(), orderDonPostDataDto.getCallbackType());
-								orderDonPostService.savePostData(orderDon.getId(), clientIp,userAgent,orderDonPostDataDto.getCallback(), orderDonPostDataDto.getCallbackType());
+								orderDonPostService.savePostData(orderDon.getId(), orderDon.getMoney(),orderDon.getCurrency(), clientIp,userAgent,orderDonPostDataDto.getCallback(), orderDonPostDataDto.getCallbackType());
 							});
 				} catch (Exception e) {
 					log.error("解析用户缓存回传信息错误,msg:{}", StringUtil.getErrorText(e));