update

fs-service/src/main/java/com/fs/his/service/impl/FsIntegralCartServiceImpl.java

@@ -164,7 +164,7 @@ public class FsIntegralCartServiceImpl extends ServiceImpl<FsIntegralCartMapper,
         for (GetFsIntegralCartListVo listVo : cartListVoList) {
             GetCartGoodsDetailsVo cartListVo = new GetCartGoodsDetailsVo();
             BeanUtils.copyProperties(listVo, cartListVo);
-            cartListVo.setGoodsIntegralTotal(listVo.getGoodsIntegral() * listVo.getQuantity());
+            cartListVo.setGoodsIntegralTotal(listVo.getGoodsIntegral() * listVo.getCartNum());
             goodsDetailsVos.add(cartListVo);
         }
         if (ObjectUtils.isNotEmpty(param.getAddressId())) {

fs-service/src/main/java/com/fs/his/vo/GetFsIntegralCartListVo.java

@@ -49,6 +49,9 @@ public class GetFsIntegralCartListVo {
     @ApiModelProperty("商品数量")
     private Integer quantity;
 
+    @ApiModelProperty("商品数量")
+    private Integer cartNum;
+
     @ApiModelProperty("用户的芳华币总数")
     private BigDecimal userIntegral;
 

fs-service/src/main/resources/mapper/his/FsIntegralCartMapper.xml

@@ -40,10 +40,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
     <update id="updateQuantityAtomically">
         UPDATE fs_integral_cart
-        SET quantity = LEAST(quantity + #{addQuantity}, #{maxQuantity}),
+        SET cart_num = LEAST(cart_num + #{addQuantity}, #{maxQuantity}),
             is_selected = 1,
             update_time = NOW()
-        WHERE user_id = #{userId} AND goods_id = #{goodsId} AND quantity <![CDATA[<]]> #{maxQuantity}
+        WHERE user_id = #{userId} AND goods_id = #{goodsId} AND cart_num <![CDATA[<]]> #{maxQuantity}
     </update>
 
     <select id="getCartCountByMap" resultType="java.lang.Integer">
@@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     <select id="getFsIntegralCartList" resultType="com.fs.his.vo.GetFsIntegralCartListVo">
-        select fc.*,fg.*,fg.integral as goodsIntegral,fu.integral as userIntegral
+        select fc.id as cart_id, fc.cart_num AS quantity,fc.*,fg.*,fg.integral as goodsIntegral,fu.integral as userIntegral
         from fs_integral_cart fc
         left join fs_integral_goods fg on fc.goods_id = fg.goods_id
         left join fs_user fu on fu.user_id = fc.user_id