Merge remote-tracking branch 'origin/feature_v20240912' into feature_v20240912

qinkelan@diligrp.com
2 parents 3443a714 fe732013
Showing 2 changed files with 16 additions and 1 deletions
etrade-order/src/main/java/com/diligrp/etrade/order/domain/ShopCartMessageVo.java
etrade-order/src/main/resources/com/diligrp/etrade/dao/mapper/shopCart/ShopCartMapper.xml
@@ -109,10 +109,15 @@ public class ShopCartMessageVo implements Serializable {
 //    private BigDecimal unitWeightVo;
     /**
-     * 总重（克）
+     * 总数量
      */
     @JsonSerialize(using = WeightK2JJsonSerializer.class)
     private Long weight;
+    /**
+     * 库存最大总数量
+     */
+    @JsonSerialize(using = WeightK2JJsonSerializer.class)
+    private Long maxWeight;
     /**
 //     * 总重（斤）
@@ -369,4 +374,12 @@ public class ShopCartMessageVo implements Serializable {
     public void setCheckFlag(Integer checkFlag) {
         this.checkFlag = checkFlag;
     }
+
+    public Long getMaxWeight() {
+        return maxWeight;
+    }
+
+    public void setMaxWeight(Long maxWeight) {
+        this.maxWeight = maxWeight;
+    }
 }
@@ -36,6 +36,7 @@
             <result column="product_name" jdbcType="VARCHAR" property="productName"/>
             <result column="prePrice" jdbcType="BIGINT" property="prePrice"/>
             <result column="createdTime" jdbcType="TIMESTAMP" property="createdTime"/>
+            <result column="maxWeight" jdbcType="BIGINT" property="maxWeight"/>
         </collection>
     </resultMap>
@@ -64,6 +65,7 @@
                scm.unit_amount,
                scm.unit_amount as prePrice,
                case when scm.weight > st.stock*100 then  st.stock*100  else scm.weight end as weight,
+               st.stock*100 as maxWeight,
                scm.weight,
                scm.amount,
                scm.type,