广告投放 修改

netflix-dao/src/main/java/com/cyksj/model/entity/AdvertisementOrderPost.java

@@ -64,12 +64,12 @@ public class AdvertisementOrderPost extends BaseEntity implements Serializable {
         /**
          * 微信
          */
-        WeChat("微信回传", "WeChat", "COMPLETE_ORDER"),
+        WeChat("微信回传", "WeChat", "PURCHASE"),
 
         /**
          * adq
          */
-        adq("腾讯回传", "adq", "COMPLETE_ORDER"),
+        adq("腾讯回传", "adq", "PURCHASE"),
 
         ;
 

netflix-dao/src/main/java/com/cyksj/model/request/WeChatPayRequest.java

@@ -2,6 +2,7 @@ package com.cyksj.model.request;
 
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 
 import javax.validation.constraints.DecimalMin;
 import javax.validation.constraints.NotNull;
@@ -15,6 +16,7 @@ import java.math.BigDecimal;
  */
 @Getter
 @Setter
+@ToString
 public class WeChatPayRequest {
 
     @NotNull(message = "缺少必填参数")

netflix-service/src/main/java/com/cyksj/service/advertisement/impl/AdvertisementOrderDonServiceImpl.java

@@ -116,7 +116,7 @@ public class AdvertisementOrderDonServiceImpl extends ServiceImpl<AdvertisementO
                 orderDon.getOpenId(),
                 orderDon.getMoney().intValue(),
                 orderDon.getOrderNo(),
-                notify + "applets/order/prepay/notify",
+                notify + "applets/advertisement/order/prepay/notify",
                 toWechatAttach,
                 project.getName(),
                 "JSAPI",

netflix-service/src/main/java/com/cyksj/service/advertisement/postdata/impl/WeChatPostDataService.java

@@ -18,6 +18,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
+import java.math.BigDecimal;
 import java.net.URLDecoder;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
@@ -89,6 +90,10 @@ public class WeChatPostDataService extends AbstractPostDataService {
                 Map<Object, Object> trace = new HashMap<>(2);
                 trace.put("click_id", clickId);
                 action.put("trace", trace);
+                BigDecimal money = orderDon.getMoney();
+                Map<Object, Object> actionParam = new HashMap<>(2);
+                actionParam.put("value",money);
+                action.put("action_param", actionParam);
                 actions.add(action);
 
                 Map<String, Object> params = new HashMap<>(2);

netflix-web/src/main/java/com/cyksj/web/controller/advertisement/AdvertisementOrderDonController.java

@@ -49,7 +49,7 @@ public class AdvertisementOrderDonController {
     public Result<H5JsPayParams> pay(@RequestBody @Validated WeChatPayRequest weChatPayRequest) throws Exception {
         final String methodName = "广告投放微信支付";
         BigDecimal donMoney = weChatPayRequest.getDonMoney();
-        log.info("{}[start] donMoney:{}", methodName, donMoney);
+        log.info("{}[start] donMoney:{} params:{}", methodName, donMoney, weChatPayRequest);
 
         if (StringUtils.isBlank(weChatPayRequest.getAppId())) {
             throw BusinessRuntimeException.getInstance("缺少必填参数appId");

netflix-web/src/main/java/com/cyksj/web/controller/advertisement/AdvertisementPopularizeController.java

@@ -31,6 +31,7 @@ public class AdvertisementPopularizeController {
 
     @GetMapping("/{id}")
     public Result<AdvertisementPopularizeView> get(@PathVariable Long id){
+        log.info("--------广告投放 链接获取详情------ \nid id:{}",id);
         AdvertisementPopularize popularize = advertisementPopularizeService.getById(id);
         if (popularize == null) {
             throw BusinessRuntimeException.getInstance("链接不存在.");