订单中子订单重复显示修复

src/main/java/com/caimei/modules/order/dao/NewShopOrderDao.java

@@ -28,6 +28,8 @@ public interface NewShopOrderDao extends CrudDao<NewShopOrder> {
 
     List<NewShopOrder> findListByOrderID(@Param("orderID") Integer orderID);
 
+    List<String> findCommercialCode(@Param("orderID") Integer orderID);
+
     String FromUnionId(Integer orderId);
 
     String UnionId(Integer userID);

src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -1247,6 +1247,12 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
             }
             if (CollectionUtils.isNotEmpty(shopOrders)) {
                 for (NewShopOrder shopOrder : shopOrders) {
+                    List<String> code = newShopOrderDao.findCommercialCode(shopOrder.getOrderID());
+                    for (String str: code) {
+                        if ("E1807059160".equals(str)) {
+                            shopOrder.setCommercialCode("E1807059160");
+                        }
+                    }
                     List<NewOrderProduct> pList = newOrderProductDao.findListByShopOrderID(shopOrder.getShopOrderID());
                     pList.forEach(orderProduct -> {
                         if ("2".equals(orderProduct.getProductCategory())) {

src/main/resources/mappings/modules/order/ShopOrderMapper.xml

@@ -259,15 +259,16 @@
         SELECT<include refid="shopOrderColumns"/>,
         b.name as shopName,
         oa.id as orderArchiveId,
-        css.commercialCode as commercialCode,
         co.receiptStatus
         FROM cm_shop_order a
         left join shop b on a.shopID = b.shopID
         left join cm_order_archive oa on a.shopOrderID = oa.shopOrderId
         left join cm_order co on co.orderID = a.orderID
-        left join cm_shop_splitcode css on a.shopID = css.shopId
         WHERE a.orderID = #{orderID} ORDER BY a.shopOrderNo DESC
     </select>
+    <select id="findCommercialCode" resultType="String">
+        select commercialCode FROM cm_shop_order a left join cm_shop_splitcode css on a.shopID = css.shopId WHERE a.orderID = #{orderID}
+    </select>
 
     <update id="update" parameterType="newShopOrder">
         update cm_shop_order