Merge branch 'feature-wm' into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/content/holo/MemberOrderHoloBo.java

@@ -72,7 +72,7 @@ public class MemberOrderHoloBo implements Serializable {
      */
     private Integer productCount;
 
-    private Integer contentMaterialId;
+    private Long contentMaterialId;
 
     /**
      * 分享导购id
@@ -88,6 +88,8 @@ public class MemberOrderHoloBo implements Serializable {
 
     private String updateTime;
 
+    private Integer deleteFlag;
+
     public String getOrderId() {
         return orderId;
     }
@@ -224,11 +226,11 @@ public class MemberOrderHoloBo implements Serializable {
         this.productCount = productCount;
     }
 
-    public Integer getContentMaterialId() {
+    public Long getContentMaterialId() {
         return contentMaterialId;
     }
 
-    public void setContentMaterialId(Integer contentMaterialId) {
+    public void setContentMaterialId(Long contentMaterialId) {
         this.contentMaterialId = contentMaterialId;
     }
 
@@ -263,4 +265,12 @@ public class MemberOrderHoloBo implements Serializable {
     public void setUpdateTime(String updateTime) {
         this.updateTime = updateTime;
     }
+
+    public Integer getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+    }
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/content/holo/MemberOrderItemHoloBo.java

+package com.gic.haoban.manage.service.pojo.bo.content.holo;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Author MUSI
+ * @Date 2023/12/8 9:06 AM
+ * @Description
+ * @Version
+ **/
+public class MemberOrderItemHoloBo implements Serializable {
+
+    private String orderItemId;
+
+    private String orderId;
+
+    private String orderNumber;
+
+    private String oorderNumber;
+
+    private String receiptsDate;
+
+    private String enterpriseId;
+
+    private String memberId;
+
+    private String storeId;
+
+    private String productId;
+
+    private String productCode;
+
+    private String productName;
+
+    private String skuId;
+
+    private String skuCode;
+
+    private String skuName;
+
+    private Integer skuNum;
+
+    private String channelCode;
+
+    /**
+     * 实付金额 含运费
+     */
+    private BigDecimal paidAmount;
+
+    /**
+     *
+     */
+    private BigDecimal payAmount;
+
+    private Long contentMaterialId;
+
+    private Long auditMaterialId;
+
+    private String createTime;
+
+    private String updateTime;
+
+    private Integer deleteFlag;
+
+    public String getOrderItemId() {
+        return orderItemId;
+    }
+
+    public void setOrderItemId(String orderItemId) {
+        this.orderItemId = orderItemId;
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+
+    public String getOrderNumber() {
+        return orderNumber;
+    }
+
+    public void setOrderNumber(String orderNumber) {
+        this.orderNumber = orderNumber;
+    }
+
+    public String getOorderNumber() {
+        return oorderNumber;
+    }
+
+    public void setOorderNumber(String oorderNumber) {
+        this.oorderNumber = oorderNumber;
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(String memberId) {
+        this.memberId = memberId;
+    }
+
+    public String getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(String storeId) {
+        this.storeId = storeId;
+    }
+
+    public String getProductId() {
+        return productId;
+    }
+
+    public void setProductId(String productId) {
+        this.productId = productId;
+    }
+
+    public String getProductCode() {
+        return productCode;
+    }
+
+    public void setProductCode(String productCode) {
+        this.productCode = productCode;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public String getSkuId() {
+        return skuId;
+    }
+
+    public void setSkuId(String skuId) {
+        this.skuId = skuId;
+    }
+
+    public String getSkuCode() {
+        return skuCode;
+    }
+
+    public void setSkuCode(String skuCode) {
+        this.skuCode = skuCode;
+    }
+
+    public String getSkuName() {
+        return skuName;
+    }
+
+    public void setSkuName(String skuName) {
+        this.skuName = skuName;
+    }
+
+    public Integer getSkuNum() {
+        return skuNum;
+    }
+
+    public void setSkuNum(Integer skuNum) {
+        this.skuNum = skuNum;
+    }
+
+    public String getChannelCode() {
+        return channelCode;
+    }
+
+    public void setChannelCode(String channelCode) {
+        this.channelCode = channelCode;
+    }
+
+    public BigDecimal getPaidAmount() {
+        return paidAmount;
+    }
+
+    public void setPaidAmount(BigDecimal paidAmount) {
+        this.paidAmount = paidAmount;
+    }
+
+    public BigDecimal getPayAmount() {
+        return payAmount;
+    }
+
+    public void setPayAmount(BigDecimal payAmount) {
+        this.payAmount = payAmount;
+    }
+
+    public Long getContentMaterialId() {
+        return contentMaterialId;
+    }
+
+    public void setContentMaterialId(Long contentMaterialId) {
+        this.contentMaterialId = contentMaterialId;
+    }
+
+    public Long getAuditMaterialId() {
+        return auditMaterialId;
+    }
+
+    public void setAuditMaterialId(Long auditMaterialId) {
+        this.auditMaterialId = auditMaterialId;
+    }
+
+    public Integer getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+    }
+
+    public String getReceiptsDate() {
+        return receiptsDate;
+    }
+
+    public void setReceiptsDate(String receiptsDate) {
+        this.receiptsDate = receiptsDate;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+}

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

@@ -3,8 +3,12 @@ package com.gic.haoban.manage.service.service.content.adaptor;
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.DataApiUtils;
 import com.gic.commons.util.DateUtil;
+import com.gic.content.api.dto.material.ContentMaterialBaseDTO;
+import com.gic.content.api.enums.MaterialPurposeEnum;
+import com.gic.content.api.service.ContentMaterialApiService;
 import com.gic.haoban.manage.api.enums.content.MaterialReportType;
 import com.gic.haoban.manage.service.util.DataTargetHttpUtils;
 import lombok.AllArgsConstructor;
@@ -13,6 +17,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
@@ -35,6 +40,7 @@ import java.util.Optional;
 @Component
 public class MaterialDataAdaptor {
 
+
     /**
      * 导购/店长 周报
      */
@@ -53,6 +59,8 @@ public class MaterialDataAdaptor {
      * 区经 月报
      */
     private static final String AREA_MONTH_DATA = "data_cms_store_month_report_total";
+    @Autowired
+    private ContentMaterialApiService contentMaterialApiService;
 
     @Data
     @AllArgsConstructor
@@ -71,6 +79,7 @@ public class MaterialDataAdaptor {
     public static class MaterialBizInfo {
         private String clerkId;
         private String bizId;
+        private String storeId;
     }
 
     /**
@@ -206,11 +215,31 @@ public class MaterialDataAdaptor {
                 return null;
             }
             JSONObject jsonObject = dataList.get(0);
-            return new MaterialBizInfo(jsonObject.getString("clerkId"), jsonObject.getString("contentMaterialId"));
+            return new MaterialBizInfo(jsonObject.getString("clerkId"), jsonObject.getString("contentMaterialId"), jsonObject.getString("storeId"));
         }catch (Exception ex) {
             log.info("查询会员素材信息异常 {}", params.toJSONString(), ex);
         }
         return null;
     }
 
+    /**
+     * 查询素材的审核素材id
+     *
+     * @param enterpriseId
+     * @param materialId
+     * @return
+     */
+    public Long queryMaterialBaseId(String enterpriseId, Long materialId) {
+        if (StringUtils.isBlank(enterpriseId) || materialId == null) {
+            return null;
+        }
+        ServiceResponse<ContentMaterialBaseDTO> serviceResponse = contentMaterialApiService.getFromMaterialById(enterpriseId,
+                materialId, MaterialPurposeEnum.AUDIT.code);
+        log.info("查询审核素材结果:{}", JSON.toJSONString(serviceResponse));
+        if (serviceResponse.isSuccess() && serviceResponse.getResult() != null) {
+            return serviceResponse.getResult().getContentMaterialId();
+        }
+        return null;
+    }
+
 }