订单售后最后商品改变订单状态

yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProductDto.java

@@ -122,10 +122,24 @@ public class ProductDto {
     private Long activityId;
 
 
+    /**
+     * 品牌Id
+     */
+    private Long brandId;
+    /**
+     * 品牌名称
+     */
+    private String brandName;
+
     /**
      * 活动参考价
      */
     @ApiModelProperty(value = "活动参考价", required = true)
     private Double activityPrice;
 
+    /**
+     * 商品副标题
+     */
+    private String halfTitle;
+
 }

yami-shop-bean/src/main/java/com/yami/shop/bean/model/Product.java

@@ -124,6 +124,10 @@ public class Product implements Serializable {
      * 品牌名称
      */
     private String brandName;
+    /**
+     * 商品副标题
+     */
+    private String halfTitle;
 
     /**
      * 已经销售数量

yami-shop-service/src/main/java/com/yami/shop/service/hb/impl/HBGoodsService.java

@@ -544,7 +544,7 @@ public class HBGoodsService implements IHBGoodsService {
         product.setBrandId(productInfo.getLong("brandId"));
         //品牌名称
         product.setBrandName(productInfo.getString("brandName"));
-        product.setBrandName(productInfo.getString("brandName"));
+        product.setHalfTitle(productInfo.getString("halfTitle"));
         String descText = productInfo.getString("descText");
         if (StringUtils.isEmpty(descText)) {
             product.setContent("<p>暂无商品详情</p>");

yami-shop-service/src/main/resources/mapper/OrderItemMapper.xml

@@ -31,7 +31,7 @@
 
     <select id="listByOrderNumber" resultType="com.yami.shop.bean.model.OrderItem">
     	select sku.spec,toi.*, tor.return_money_sts, tor.refund_sn from tz_order_item toi
-        left JOIN tz_order_refund tor ON tor.`order_item_id` = toi.`order_item_id` AND tor.`return_money_sts` not in (6,7, -1)
+        left JOIN tz_order_refund tor ON tor.`order_item_id` = toi.`order_item_id` AND tor.`return_money_sts` not in (30, 40)
         LEFT JOIN tz_sku sku on toi.sku_id=sku.sku_id
         where toi.order_number = #{orderNumber}
     </select>
@@ -88,7 +88,7 @@
         FROM `tz_order_refund_sku` a
                  LEFT JOIN tz_order_refund b on a.order_refund_id = b.refund_id
         WHERE a.order_item_id = #{orderItemId}
-          and b.return_money_sts !=40
+          and b.return_money_sts not in (30,40)
     </select>
 
 </mapper>

yami-shop-service/src/main/resources/mapper/ProductMapper.xml

@@ -130,46 +130,17 @@
 
     <select id="doGetById" resultType="com.yami.shop.bean.model.Product">
         SELECT
-            tp.prod_id,
-            MAX(tp.prod_name) AS prod_name,
-            tcs.shop_id AS shop_id,
-            MAX(tp.brand_id) AS brand_id,
-            MAX(tp.brand_name) AS brand_name,
-            MAX(tp.ori_price) AS ori_price,
-            MAX(tss.shop_sku_price) AS price,
-            MAX(tp.score_price) AS score_price,
-            MAX(tp.brief) AS brief,
-            MAX(tp.video) AS video,
-            MAX(tp.pic) AS pic,
-            MAX(tp.content) AS content,
-            MAX(tp.imgs) AS imgs,
-            MAX(tp.status) AS status,
-            MAX(tp.is_delete) AS is_delete,
-            MAX(tp.shop_category_id) AS shop_category_id,
-            MAX(tp.category_id) AS category_id,
-            MAX(tp.hb_front_category_id) AS hb_front_category_id,
-            MAX(tp.sold_num) AS sold_num,
-            SUM(tss.shop_sku_stocks) AS total_stocks,
-            MAX(tp.delivery_mode) AS delivery_mode,
-            MAX(tp.delivery_template_id) AS delivery_template_id,
-            MAX(tp.create_time) AS create_time,
-            MAX(tp.update_time) AS update_time,
-            MAX(tp.putaway_time) AS putaway_time,
-            MAX(tp.version) AS version,
-            MAX(tp.prod_type) AS prod_type,
-            MAX(tp.activity_id) AS activity_id,
-            MAX(tp.sup_id) AS sup_id,
-            MAX(tp.hb_spu_id) AS hb_spu_id,
-            MAX(tp.hb_status) AS hb_status
-        FROM tz_prod AS tp
-                 LEFT JOIN tz_shop_sku AS tss ON tp.prod_id = tss.spu_id
-                 LEFT JOIN tz_channel_shop AS tcs ON tss.shop_id = tcs.shop_id
+            tp.*,
+            SUM(tss.shop_sku_stocks) AS total_stocks
+        FROM tz_prod tp
+                 INNER JOIN tz_shop_sku tss ON tp.prod_id = tss.spu_id
+                 INNER JOIN tz_channel_shop tcs ON tss.shop_id = tcs.shop_id AND tcs.channel_id = #{platform}
         WHERE tp.prod_id = #{prodId}
-          AND tcs.channel_id = #{platform} and tp.`is_delete`=0
-        GROUP BY
-            tp.prod_id,
-            tcs.shop_id
-        LIMIT 1
+          AND tp.is_delete = 0
+          AND tss.is_delete = 0
+        GROUP BY tp.prod_id, tcs.shop_id
+            LIMIT 1
+
     </select>