Merge branch 'feature-wm' into developer

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

@@ -55,6 +55,7 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -356,16 +357,22 @@ public class QywxGroupMsgTaskApiServiceImpl implements QywxGroupMsgTaskApiServic
                 log.error("recordMemberOrderForData 数仓数据源链接异常, 请检查！！！！{}", JSON.toJSONString(orderConvertBos));
                 return ServiceResponse.success();
             }
-            TableSchema tableSchema = client.getTableSchema("tab_gic_cms_order");
             SerializeConfig serializeConfig = new SerializeConfig();
             serializeConfig.setPropertyNamingStrategy(PropertyNamingStrategy.SnakeCase);
             JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(orderHoloBo, serializeConfig));
+            if (StringUtils.isNotBlank(orderHoloBo.getShareClerkId())) {
+                TableSchema tableSchema = client.getTableSchema("tab_gic_cms_order");
                 Put temp = new Put(tableSchema);
                 for (Map.Entry<String, Object> entry : jsonObject.entrySet()) {
                     temp.setObject(entry.getKey(), entry.getValue());
                 }
                 client.put(Collections.singletonList(temp));
+            }
 
+            orderItemHoloBos = orderItemHoloBos
+                    .stream()
+                    .filter(item -> Objects.nonNull(item.getContentMaterialId()))
+                    .collect(Collectors.toList());
             if (CollectionUtils.isNotEmpty(orderItemHoloBos)) {
                 TableSchema cmsOrderItem = client.getTableSchema("tab_gic_cms_order_item");
                 List<Put> puts = orderItemHoloBos.stream()