feat: 商品下单互动记录

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/content/context/InteractRecordMessageContext.java

@@ -9,6 +9,7 @@ import com.gic.haoban.manage.service.pojo.bo.content.message.InteractRecordMessa
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.math.NumberUtils;
 import org.springframework.beans.BeanUtils;
 
 import java.util.Date;
@@ -44,7 +45,9 @@ public class InteractRecordMessageContext {
      * @return
      */
     public Integer getBizType() {
-        if (StringUtils.isNotBlank(interactRecordMessageBO.getMaterialId())) {
+        // 素材id不为空 且 素材id是数字类型
+        if (StringUtils.isNotBlank(interactRecordMessageBO.getMaterialId())
+                && NumberUtils.isDigits(interactRecordMessageBO.getMaterialId())) {
             return ShareBizType.MATERIAL.getCode();
         }
         return ShareBizType.GOODS.getCode();

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/InteractRecordService.java

@@ -68,10 +68,10 @@ public interface InteractRecordService {
     /**
      * 查询最新的一条互动记录
      * @param clerkId
-     * @param materialId
+     * @param bizId
      * @param memberId
      * @return
      */
-    InteractRecordBO queryLeastRecord(String enterpriseId, String clerkId, String materialId, String memberId);
+    InteractRecordBO queryLeastRecord(String enterpriseId, String clerkId, String bizId, String memberId);
 
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/impl/InteractRecordServiceImpl.java

@@ -232,16 +232,16 @@ public class InteractRecordServiceImpl implements InteractRecordService {
      * 查询最新的一条互动记录
      *
      * @param clerkId
-     * @param materialId
+     * @param bizId
      * @param memberId
      * @return
      */
     @Override
-    public InteractRecordBO queryLeastRecord(String enterpriseId, String clerkId, String materialId, String memberId) {
+    public InteractRecordBO queryLeastRecord(String enterpriseId, String clerkId, String bizId, String memberId) {
         InteractRecordQO interactRecordQO = new InteractRecordQO();
         interactRecordQO.setEnterpriseId(enterpriseId);
         interactRecordQO.setClerkId(clerkId);
-        interactRecordQO.setBizId(materialId);
+        interactRecordQO.setBizId(bizId);
         interactRecordQO.setMemberId(memberId);
         PageHelper.startPage(1, 1);
         com.github.pagehelper.Page<TabHaobanInteractRecord> pageResult =

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/message/InteractRecordMessageService.java

@@ -164,9 +164,14 @@ public class InteractRecordMessageService {
      * @return
      */
     public InteractRecordBO getInteractRecordBOWithOrderType(InteractRecordMessageBO interactRecordMessageBO) {
-        InteractRecordBO interactRecordBO;
+        InteractRecordBO interactRecordBO = null;
+        String bizId = interactRecordMessageBO.getMaterialId();
+        if (StringUtils.isBlank(bizId)) {
+            bizId = interactRecordMessageBO.getGoodsId();
+        }
+
         interactRecordBO = interactRecordService.queryLeastRecord(interactRecordMessageBO.getEnterpriseId(), interactRecordMessageBO.getClerkId(),
-                interactRecordMessageBO.getMaterialId(), interactRecordMessageBO.getMemberId());
+                bizId, interactRecordMessageBO.getMemberId());
         return interactRecordBO;
     }
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/content/MallOrderStatusChangeApiServiceImpl.java

@@ -83,8 +83,14 @@ public class MallOrderStatusChangeApiServiceImpl implements MallOrderStatusChang
         interactRecordMessageBO.setEnterpriseId(orderEventMqBO.getEnterpriseId());
         interactRecordMessageBO.setMemberId(memberId);
         interactRecordMessageBO.setClerkId(clerkId);
+        if (StringUtils.isNotBlank(contentMaterialId) && StringUtils.isNumeric(contentMaterialId)) {
             interactRecordMessageBO.setMaterialId(contentMaterialId);
+        }else if (StringUtils.isNotBlank(goodsId) && StringUtils.isNumeric(goodsId)) {
             interactRecordMessageBO.setGoodsId(goodsId);
+        }else {
+            log.info("订单扩展信息中无要处理的数据 {}", extendJson);
+            return ServiceResponse.success();
+        }
         interactRecordMessageBO.setEventType(MaterialInteractRecordEventType.ORDER.getCode());
         interactRecordMessageBO.setDurationTime(0);
         interactRecordMessageBO.setLastAccessTime(orderInfo.getCreateTime().getTime());

haoban-manage3-service/src/test/java/InteractRecordMessageServiceTest.java

@@ -89,4 +89,11 @@ public class InteractRecordMessageServiceTest {
         ServiceResponse<Page<PotentialCustomerDTO>> pageServiceResponse = potentialCustomerApiService.queryPotentialCustomer(potentialCustomerQDTO);
         System.out.println(JSONObject.toJSONString(pageServiceResponse));
     }
+
+    @Test
+    public void orderTest() {
+
+        String json = "";
+        //interactRecordMessageService.dealRecord("");
+    }
 }