Merge remote-tracking branch 'origin/master'

order-application-service/src/main/java/cn/freemud/entities/dto/PaySuccessBuridPointDto.java

+package cn.freemud.entities.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PaySuccessBuridPointDto {
+
+    /**
+     * 用户id
+     */
+    @JsonProperty("user_id")
+    private String userId;
+
+    /**
+     * 用户行为标识 9=结算支付
+     */
+    private String action;
+
+    /**
+     * 商户ID
+     */
+    @JsonProperty("partner_id")
+    private String partnerId;
+
+    /**
+     * 门店ID
+     */
+    @JsonProperty("store_id")
+    private String storeId;
+
+    /**
+     * 商品Id
+     */
+    private List<String> skus;
+
+    /**
+     * 商品Id
+     */
+    @JsonProperty("create_time")
+    private String createTime;
+
+}

order-application-service/src/main/java/cn/freemud/service/BuriedPointService.java

@@ -26,4 +26,6 @@ public interface BuriedPointService {
      * 埋点支付
      */
     BaseResponse BuriedPointPayment(BuriedPointPaymentRequestDto requestDto, QueryOrdersResponseDto.DataBean.OrderBean orderBean);
+
+    BaseResponse paySuccessBuridPoint(String partnerId,String storeId,QueryOrdersResponseDto.DataBean.OrderBean orderBean);
 }

order-application-service/src/main/java/cn/freemud/service/impl/BuriedPointServiceImpl.java

@@ -9,6 +9,7 @@ import cn.freemud.enums.GuessLikeStatus;
 import cn.freemud.manager.OpenPlatformIappWxappConfigManager;
 import cn.freemud.redis.RedisCache;
 import cn.freemud.service.BuriedPointService;
+import cn.freemud.service.thirdparty.BuriedPointClient;
 import cn.freemud.service.thirdparty.SyncTxProductClient;
 import cn.freemud.utils.LogUtil;
 import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformIappWxappConfig;
@@ -61,6 +62,8 @@ public class BuriedPointServiceImpl implements BuriedPointService {
     private AssortmentOpenPlatformWxappManager openPlatformWxappManager;
     @Autowired
     private AssortmentOpenPlatformIappWxappConfigManager openPlatformIappWxappConfigManager;
+    @Autowired
+    private BuriedPointClient buriedPointClient;
 
     @Override
     public BaseResponse BuriedPointPayment(BuriedPointPaymentRequestDto requestDto, QueryOrdersResponseDto.DataBean.OrderBean orderBean) {
@@ -166,4 +169,30 @@ public class BuriedPointServiceImpl implements BuriedPointService {
         }
         return false;
     }
+
+    public BaseResponse paySuccessBuridPoint(String partnerId,String storeId,QueryOrdersResponseDto.DataBean.OrderBean orderBean) {
+        try {
+            PaySuccessBuridPointDto paySuccessBuridPointDto = new PaySuccessBuridPointDto();
+            paySuccessBuridPointDto.setPartnerId(partnerId);
+            paySuccessBuridPointDto.setStoreId(storeId);
+            paySuccessBuridPointDto.setUserId(orderBean.getUserId());
+            paySuccessBuridPointDto.setAction("9");
+            paySuccessBuridPointDto.setCreateTime(DateUtil.convert2String(new Date(),DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
+            List<QueryOrdersResponseDto.DataBean.OrderBean.ProductBean> productList = orderBean.getProductList();
+            List<String> skus = new ArrayList<>(0);
+            for (int i = 0; i < productList.size(); i++) {
+                QueryOrdersResponseDto.DataBean.OrderBean.ProductBean productBean = productList.get(i);
+                if (StringUtils.isNotBlank(productBean.getParentProductId())) {
+                    skus.add(productBean.getProductId());
+                }
+            }
+
+            paySuccessBuridPointDto.setSkus(skus);
+            log.info("paySuccessBuridPoint {}" + paySuccessBuridPointDto);
+            Integer str = buriedPointClient.returnSubmit(paySuccessBuridPointDto);
+        } catch (Exception e) {
+            log.info("paySuccessBuridPoint error {}" + e);
+        }
+        return null;
+    }
 }

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -571,6 +571,8 @@ public class OrderServiceImpl implements Orderservice {
             verificationCoupon(message.getTrans_id());
             log.info("调用券码结束=="+ message.getTrans_id());
         }
+        //支付成功后
+        buriedPointService.paySuccessBuridPoint(partnerId,storeId,orderBean);
         return sendPaySuccessNoticeMessage();
     }
 

order-application-service/src/main/java/cn/freemud/service/thirdparty/BuriedPointClient.java

+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @Title: PaymentClient
+ * @Package cn.freemud.service.thirdparty
+ * @Description: 支付服务
+ * @author: liming.guo
+ * @date: 2018/5/12519:24
+ * @version V1.0
+ * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+
+package cn.freemud.service.thirdparty;
+
+import cn.freemud.entities.dto.PaySuccessBuridPointDto;
+import cn.freemud.entities.dto.pay.CombPayResponse;
+import com.freemud.sdk.api.assortment.order.request.payment.CombPayRequest;
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+
+@FeignClient(name = "favorite",url="${saas.favorite.submit.url}")
+@RequestMapping(produces = {"application/json;charset=UTF-8"})
+public interface BuriedPointClient {
+
+    /**
+     * 支付成功埋点
+     */
+    @PostMapping("/favorite/submit")
+    Integer returnSubmit(@RequestBody PaySuccessBuridPointDto paySuccessBuridPointDto);
+}