Merge branch 'feature-wm' into developer

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

@@ -430,6 +430,7 @@ public class QywxGroupMsgTaskApiServiceImpl implements QywxGroupMsgTaskApiServic
                         orderItemHoloBo.setReceiptsDate(DateUtil.dateToStr(orderDTO.getOrderTime(), DateUtil.FORMAT_DATETIME_19));
                         orderItemHoloBo.setEnterpriseId(orderDTO.getEnterpriseId());
                         orderItemHoloBo.setMemberId(item.getMemberId());
+                        orderItemHoloBo.setChannelCode(orderHoloBo.getChannelCode());
                         orderItemHoloBo.setStoreId(orderItemHoloBo.getStoreId());
                         orderItemHoloBo.setProductCode(item.getProductCode());
                         orderItemHoloBo.setProductName(item.getProductName());
@@ -498,6 +499,7 @@ public class QywxGroupMsgTaskApiServiceImpl implements QywxGroupMsgTaskApiServic
                         orderItemHoloBo.setReceiptsDate(DateUtil.dateToStr(eorderDTO.getOrderCreateTime(), DateUtil.FORMAT_DATETIME_19));
                         orderItemHoloBo.setEnterpriseId(item.getEnterpriseId());
                         orderItemHoloBo.setMemberId(item.getMemberId());
+                        orderItemHoloBo.setChannelCode(orderHoloBo.getChannelCode());
                         orderItemHoloBo.setStoreId(eorderDTO.getStoreId());
                         orderItemHoloBo.setProductId(item.getGoodsId());
                         orderItemHoloBo.setProductCode(item.getGoodsCode());