商品名称与通用名称问题,导致小程序展示问题

fs-service/src/main/java/com/fs/hisStore/dto/FsStoreCartDTO.java

@@ -35,4 +35,8 @@ import java.math.BigDecimal;
 
     private String erpSkuName;
 
+    /** 商品通用名 */
+    private String commonName;
+
+
 }

fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreCartScrmMapper.java

@@ -121,7 +121,7 @@ public interface FsStoreCartScrmMapper
 
     @Select({"<script> " +
             "select q.* FROM (" +
-            "select c.*,p.cate_id,p.product_name,p.image as product_image,p.temp_id,p.product_type,v.price,v.ot_price," +
+            "select c.*,p.cate_id,p.product_name,p.common_name, p.image as product_image,p.temp_id,p.product_type,v.price,v.ot_price," +
             "v.sku as product_attr_name,v.image as product_attr_image,v.stock,v.cost,v.integral,v.weight," +
             "v.volume,v.bar_code,v.group_bar_code,v.brokerage,v.brokerage_two," +
             "v.brokerage_three,s.store_id,s.store_name from fs_store_cart_scrm c left join fs_store_product_scrm p " +
@@ -170,7 +170,7 @@ public interface FsStoreCartScrmMapper
 
     @Select({"<script> " +
             "select q.* FROM (" +
-            "select c.*,p.product_type,p.product_name,p.image as product_image,v.price,v.sku as product_attr_name," +
+            "select c.*,p.product_type,p.product_name,p.common_name, p.image as product_image,v.price,v.sku as product_attr_name," +
             "v.image as product_attr_image,v.stock,s.store_id,s.store_name " +
             "from fs_store_cart_scrm c " +
             "inner join fs_store_product_scrm p on p.product_id=c.product_id " +

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -5118,6 +5118,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                 fsStoreCartDTO.setGroupBarCode(vo.getGroupBarCode());
                 fsStoreCartDTO.setBrokerage(vo.getBrokerage());
                 fsStoreCartDTO.setBrokerageTwo(vo.getBrokerageTwo());
+                fsStoreCartDTO.setCommonName(ObjectUtil.isNotEmpty(vo.getCommonName())?vo.getCommonName():vo.getProductName());
                 fsStoreCartDTO.setBrokerageThree(vo.getBrokerageThree());
                 if (StringUtils.isEmpty(vo.getProductAttrImage())) {
                     fsStoreCartDTO.setImage(vo.getProductImage());

fs-service/src/main/java/com/fs/hisStore/vo/FsMyStoreOrderListQueryVO.java

@@ -64,4 +64,9 @@ public class FsMyStoreOrderListQueryVO implements Serializable
      * **/
     private String storeName;
 
+    /**
+     * 商品通用名
+     * **/
+    private String commonName;
+
 }

fs-service/src/main/java/com/fs/store/vo/FsStoreCartScrmQueryVO.java

@@ -70,4 +70,6 @@ import java.math.BigDecimal;
     private String storeId;
     private String storeName;
 
+    private String commonName;
+
 }

fs-service/src/main/java/com/fs/store/vo/FsStoreCartScrmVO.java

@@ -44,4 +44,9 @@ import java.math.BigDecimal;
 
     //数量
     private Integer num;
+
+    /**
+     * 商品通用名
+     */
+    private String commonName;
 }

fs-service/src/main/resources/mapper/hisStore/FsPlatformProductScrmMapper.xml

@@ -233,7 +233,10 @@
     <select id="getProductNoticeInfo" resultType="java.lang.String">
         SELECT
         CONCAT(
-        product_name,
+        CASE
+        WHEN common_name IS NULL OR common_name = '' OR common_name = '-' THEN product_name
+        ELSE common_name
+        END,
         '商品的',
         '生产企业营业执照',
         CASE
@@ -250,7 +253,10 @@
         UNION ALL
         SELECT
         CONCAT(
-        product_name,
+        CASE
+        WHEN common_name IS NULL OR common_name = '' OR common_name = '-' THEN product_name
+        ELSE common_name
+        END,
         '商品的',
         '生产企业的生产许可证/备案凭证',
         CASE
@@ -267,7 +273,10 @@
         UNION ALL
         SELECT
         CONCAT(
-        product_name,
+        CASE
+        WHEN common_name IS NULL OR common_name = '' OR common_name = '-' THEN product_name
+        ELSE common_name
+        END,
         '商品的',
         '商品注册证/备案凭证',
         CASE