查询订单关联素材从查数据组迁到content模块

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/content/binlog/MemberOrderBo.java

@@ -49,6 +49,10 @@ public class MemberOrderBo implements Serializable {
      */
     private Integer times;
 
+    /**
+     * 订单类型
+     */
+    private Integer orderType;
 
     public Integer getOrderStatus() {
         return orderStatus;
@@ -121,4 +125,12 @@ public class MemberOrderBo implements Serializable {
     public void setTimes(Integer times) {
         this.times = times;
     }
+
+    public Integer getOrderType() {
+        return orderType;
+    }
+
+    public void setOrderType(Integer orderType) {
+        this.orderType = orderType;
+    }
 }

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

@@ -197,6 +197,7 @@ public class InteractRecordApiServiceImpl implements InteractRecordApiService {
         memberOrderBo.setOrderId(orderSaveNotifyDTO.getOrderId());
         memberOrderBo.setOrderNumber(orderInfoResp.getRorderNumber());
         memberOrderBo.setOrderTime(orderInfoResp.getOrderTime());
+        memberOrderBo.setOrderType(orderInfoResp.getOrderType());
         if (isOnlineOrder) {
             memberOrderBo.setTableName(KafkaMessageServiceImpl.tab_gic_eorder);
         }else {

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

@@ -9,8 +9,11 @@ import com.gic.business.order.enums.OrderEnum;
 import com.gic.business.order.qdto.ordermanage.OrderInfoQDTO;
 import com.gic.business.order.service.ordermanage.OrderInfoOutApiService;
 import com.gic.commons.util.GICMQClientUtil;
+import com.gic.content.api.dto.burypoint.ContentMemberBuryPointDTO;
 import com.gic.content.api.dto.setting.ContentSettingDTO;
 import com.gic.content.api.enums.ContentMallShopType;
+import com.gic.content.api.qdto.burypoint.MemberBuryPointOrderQDTO;
+import com.gic.content.api.service.ContentMemberBuryPointApiService;
 import com.gic.content.api.service.ContentSettingApiService;
 import com.gic.enterprise.api.constant.EnterpriseServiceEnum;
 import com.gic.enterprise.api.dto.enterprise.EnterpriseUsingStatusDTO;
@@ -61,6 +64,8 @@ public class MallOrderStatusChangeApiServiceImpl implements MallOrderStatusChang
     private EnterpriseUseForbidService enterpriseUseForbidService;
     @Autowired
     private ContentSettingApiService contentSettingApiService;
+    @Autowired
+    private ContentMemberBuryPointApiService contentMemberBuryPointApiService;
 
     private static final String ORDER_EVENT_RETRY = "orderEventRetryMQ";
 
@@ -242,11 +247,24 @@ public class MallOrderStatusChangeApiServiceImpl implements MallOrderStatusChang
         String orderId = memberOrderBo.getOrderId();
         String orderNumber = memberOrderBo.getOrderNumber();
         Date orderTime = memberOrderBo.getOrderTime();
+        Integer orderType = memberOrderBo.getOrderType();
         InteractRecordMessageBO interactRecordMessageBO = new InteractRecordMessageBO();
         interactRecordMessageBO.setEnterpriseId(enterpriseId);
         interactRecordMessageBO.setMemberId(memberId);
-        MaterialDataAdaptor.MaterialBizInfo materialBizInfo = materialDataAdaptor.queryMaterialBizInfo(enterpriseId, memberId, orderTime, null);
-
+        MaterialDataAdaptor.MaterialBizInfo materialBizInfo = null;
+        MemberBuryPointOrderQDTO memberBuryPointOrderQDTO = new MemberBuryPointOrderQDTO();
+        memberBuryPointOrderQDTO.setEnterpriseId(enterpriseId);
+        memberBuryPointOrderQDTO.setOrderCreateTime(orderTime);
+        memberBuryPointOrderQDTO.setMemberId(memberId);
+        memberBuryPointOrderQDTO.setConvFlag(1);
+        memberBuryPointOrderQDTO.setMallType(2);
+        memberBuryPointOrderQDTO.setOrderType(orderType);
+        ServiceResponse<ContentMemberBuryPointDTO> buryPointResponse = contentMemberBuryPointApiService.queryMemberBuryPoint(memberBuryPointOrderQDTO);
+        if (buryPointResponse.isSuccess() && buryPointResponse.getResult() != null) {
+            ContentMemberBuryPointDTO result = buryPointResponse.getResult();
+            materialBizInfo = new MaterialDataAdaptor.MaterialBizInfo(result.getClerkId(), String.valueOf(result.getContentMaterialId()), result.getStoreId());
+        }
+//        MaterialDataAdaptor.MaterialBizInfo materialBizInfo = materialDataAdaptor.queryMaterialBizInfo(enterpriseId, memberId, orderTime, null);
         if (materialBizInfo == null) {
             if (memberOrderBo.getTimes() == null) {
                 memberOrderBo.setTimes(1);

haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml

@@ -244,6 +244,7 @@
     <dubbo:reference id="contentProducerApiService" interface="com.gic.content.api.service.ContentProducerApiService" timeout="10000" retries="0" check="false" />
     <dubbo:reference interface="com.gic.content.api.service.ContentMaterialApiService" id="contentMaterialApiService" timeout="10000" retries="0" check="false" />
     <dubbo:reference interface="com.gic.content.api.service.ContentSettingApiService" id="contentSettingApiService" timeout="10000" retries="0" check="false" />
+    <dubbo:reference interface="com.gic.content.api.service.ContentMemberBuryPointApiService" id="contentMemberBuryPointApiService" timeout="10000" retries="0" check="false" />
     <dubbo:reference interface="com.gic.clerk.api.service.MenuApiService" id="menuApiService" timeout="10000" retries="0" check="false" />
     <dubbo:reference interface="com.gic.member.ext.api.service.MemberGrowthWriteApiService" id="memberGrowthWriteApiService" timeout="10000" retries="0" check="false" />
     <dubbo:reference interface="com.gic.member.api.service.integral.IntegralWriteApiService" id="integralWriteApiService"  timeout="10000" retries="0" check="false"/>