Merge branch 'ww' into test
# Conflicts: # src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProduct.java # src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
This commit is contained in:
@@ -134,6 +134,8 @@ public class TbProduct implements Serializable {
|
|||||||
|
|
||||||
private Integer stockNumber;
|
private Integer stockNumber;
|
||||||
|
|
||||||
|
private Integer warnLine = 0;
|
||||||
|
|
||||||
@Transient
|
@Transient
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private int orderCount;
|
private int orderCount;
|
||||||
@@ -150,5 +152,4 @@ public class TbProduct implements Serializable {
|
|||||||
|
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -35,8 +35,6 @@ public class TbProductSku implements Serializable {
|
|||||||
|
|
||||||
private String coverImg;
|
private String coverImg;
|
||||||
|
|
||||||
private Integer warnLine;
|
|
||||||
|
|
||||||
private Double weight;
|
private Double weight;
|
||||||
|
|
||||||
private Float volume;
|
private Float volume;
|
||||||
|
|||||||
@@ -391,39 +391,8 @@ public class OrderService {
|
|||||||
return Result.success(CodeEnum.SUCCESS, masterId);
|
return Result.success(CodeEnum.SUCCESS, masterId);
|
||||||
}
|
}
|
||||||
|
|
||||||
private TbCashierCart getCashierInfo(Object shopId, Object skuId, Object productId, String tableId, String MasterId, ShopEatTypeInfoDTO shopEatTypeInfoDTO) {
|
private void setRedisTableCartInfo(String tableId, String shopId, List<TbCashierCart> tbCashierCartList, boolean isAdd) {
|
||||||
LambdaQueryWrapper<TbCashierCart> query = new LambdaQueryWrapper<TbCashierCart>()
|
String tableCartKey = RedisCst.getTableCartKey(tableId, shopId);
|
||||||
.eq(TbCashierCart::getShopId, shopId)
|
|
||||||
.eq(TbCashierCart::getSkuId, skuId)
|
|
||||||
.eq(TbCashierCart::getProductId, productId)
|
|
||||||
.in(TbCashierCart::getStatus, "create")
|
|
||||||
.eq(TbCashierCart::getUseType, shopEatTypeInfoDTO.getUseType());
|
|
||||||
|
|
||||||
if (shopEatTypeInfoDTO.isDineInAfter()) {
|
|
||||||
query.isNull(TbCashierCart::getPlaceNum);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (shopEatTypeInfoDTO.isTakeout()) {
|
|
||||||
query.eq(TbCashierCart::getTradeDay, DateUtils.getDay())
|
|
||||||
.eq(TbCashierCart::getMasterId, MasterId);
|
|
||||||
}else {
|
|
||||||
query.eq(TbCashierCart::getTableId, tableId).and(query2 -> query2.and(query3 -> query3.eq(TbCashierCart::getTradeDay, DateUtils.getDay())
|
|
||||||
.eq(TbCashierCart::getMasterId, MasterId))
|
|
||||||
.or(query4 -> query4.isNull(TbCashierCart::getTradeDay)
|
|
||||||
.and(q -> q.eq(TbCashierCart::getMasterId, "").or().isNull(TbCashierCart::getMasterId))
|
|
||||||
)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return mpCashierCartMapper.selectOne(query);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 设置小程序购物车缓存
|
|
||||||
*/
|
|
||||||
private void setRedisTableCartInfo(String tableId, Object shopId, List<TbCashierCart> tbCashierCartList, boolean isAdd) {
|
|
||||||
String tableCartKey = RedisCst.getTableCartKey(tableId, shopId.toString());
|
|
||||||
String tableCart = redisUtil.getMessage(tableCartKey);
|
String tableCart = redisUtil.getMessage(tableCartKey);
|
||||||
|
|
||||||
List<TbCashierCart> cartArrayList = new ArrayList<>();
|
List<TbCashierCart> cartArrayList = new ArrayList<>();
|
||||||
@@ -451,7 +420,7 @@ public class OrderService {
|
|||||||
private void checkWarnLineAndSendMsg(TbProductSku productSku, TbProduct product, Integer shopId, Integer num) {
|
private void checkWarnLineAndSendMsg(TbProductSku productSku, TbProduct product, Integer shopId, Integer num) {
|
||||||
log.info("下单,开始校验库存预警,商品信息:{}, {}, {}", product, productSku, num);
|
log.info("下单,开始校验库存预警,商品信息:{}, {}, {}", product, productSku, num);
|
||||||
|
|
||||||
if (productSku.getWarnLine() == null) {
|
if (product.getWarnLine() == null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -459,21 +428,15 @@ public class OrderService {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (productSku.getStockNumber() == null) {
|
|
||||||
productSku.setStockNumber((double) 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (product.getStockNumber() == null) {
|
if (product.getStockNumber() == null) {
|
||||||
product.setStockNumber(0);
|
product.setStockNumber(0);
|
||||||
}
|
}
|
||||||
if (
|
if (product.getStockNumber() - num <= product.getWarnLine()) {
|
||||||
(product.getIsDistribute() == 1 && product.getStockNumber() - num <= productSku.getWarnLine())
|
|
||||||
|| (product.getIsDistribute() != 1) && productSku.getStockNumber() - num <= productSku.getWarnLine()
|
|
||||||
) {
|
|
||||||
List<TbShopOpenId> shopOpenIds = shopOpenIdMapper.selectStateByShopIdAndType(product.getShopId(), ShopWxMsgTypeEnum.STOCK_MSG.getType());
|
List<TbShopOpenId> shopOpenIds = shopOpenIdMapper.selectStateByShopIdAndType(product.getShopId(), ShopWxMsgTypeEnum.STOCK_MSG.getType());
|
||||||
shopOpenIds.forEach(item -> {
|
shopOpenIds.forEach(item -> {
|
||||||
wxAccountUtil.sendStockWarnMsg("商品库存不足", product.getName(),
|
wxAccountUtil.sendStockWarnMsg("商品库存不足", product.getName(),
|
||||||
product.getIsDistribute() == 1 ? product.getStockNumber() - num : (int) (productSku.getStockNumber() - num), item.getOpenId(), ShopWxMsgTypeEnum.STOCK_MSG, shopId);
|
product.getStockNumber() - num , item.getOpenId(), ShopWxMsgTypeEnum.STOCK_MSG, shopId);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -63,6 +63,7 @@
|
|||||||
<result column="tax_config_id" jdbcType="VARCHAR" property="taxConfigId" />
|
<result column="tax_config_id" jdbcType="VARCHAR" property="taxConfigId" />
|
||||||
<result column="spec_table_headers" jdbcType="VARCHAR" property="specTableHeaders" />
|
<result column="spec_table_headers" jdbcType="VARCHAR" property="specTableHeaders" />
|
||||||
<result column="stock_number" jdbcType="INTEGER" property="stockNumber" />
|
<result column="stock_number" jdbcType="INTEGER" property="stockNumber" />
|
||||||
|
<result column="warn_line" jdbcType="INTEGER" property="warnLine" />
|
||||||
</resultMap>
|
</resultMap>
|
||||||
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.chaozhanggui.system.cashierservice.entity.TbProductWithBLOBs">
|
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.chaozhanggui.system.cashierservice.entity.TbProductWithBLOBs">
|
||||||
<result column="images" jdbcType="LONGVARCHAR" property="images" />
|
<result column="images" jdbcType="LONGVARCHAR" property="images" />
|
||||||
@@ -81,7 +82,7 @@
|
|||||||
created_at, updated_at, base_sales_number, real_sales_number, sales_number, thumb_count,
|
created_at, updated_at, base_sales_number, real_sales_number, sales_number, thumb_count,
|
||||||
store_count, furnish_meal, furnish_express, furnish_draw, furnish_vir, is_combo,
|
store_count, furnish_meal, furnish_express, furnish_draw, furnish_vir, is_combo,
|
||||||
is_show_cash, is_show_mall, is_need_examine, show_on_mall_status, show_on_mall_time,
|
is_show_cash, is_show_mall, is_need_examine, show_on_mall_status, show_on_mall_time,
|
||||||
show_on_mall_error_msg, enable_label, tax_config_id, spec_table_headers, stock_number
|
show_on_mall_error_msg, enable_label, tax_config_id, spec_table_headers, stock_number,warn_line
|
||||||
</sql>
|
</sql>
|
||||||
<sql id="Blob_Column_List">
|
<sql id="Blob_Column_List">
|
||||||
images, video, notice, group_snap, spec_info, select_spec
|
images, video, notice, group_snap, spec_info, select_spec
|
||||||
@@ -120,7 +121,7 @@
|
|||||||
show_on_mall_status, show_on_mall_time, show_on_mall_error_msg,
|
show_on_mall_status, show_on_mall_time, show_on_mall_error_msg,
|
||||||
enable_label, tax_config_id, spec_table_headers,
|
enable_label, tax_config_id, spec_table_headers,
|
||||||
images, video, notice,
|
images, video, notice,
|
||||||
group_snap, spec_info, select_spec, stock_number
|
group_snap, spec_info, select_spec, stock_number,warn_line
|
||||||
)
|
)
|
||||||
values (#{id,jdbcType=INTEGER}, #{categoryId,jdbcType=VARCHAR}, #{specId,jdbcType=INTEGER},
|
values (#{id,jdbcType=INTEGER}, #{categoryId,jdbcType=VARCHAR}, #{specId,jdbcType=INTEGER},
|
||||||
#{sourcePath,jdbcType=VARCHAR}, #{brandId,jdbcType=INTEGER}, #{merchantId,jdbcType=VARCHAR},
|
#{sourcePath,jdbcType=VARCHAR}, #{brandId,jdbcType=INTEGER}, #{merchantId,jdbcType=VARCHAR},
|
||||||
@@ -144,7 +145,7 @@
|
|||||||
#{enableLabel,jdbcType=TINYINT}, #{taxConfigId,jdbcType=VARCHAR}, #{specTableHeaders,jdbcType=VARCHAR},
|
#{enableLabel,jdbcType=TINYINT}, #{taxConfigId,jdbcType=VARCHAR}, #{specTableHeaders,jdbcType=VARCHAR},
|
||||||
#{images,jdbcType=LONGVARCHAR}, #{video,jdbcType=LONGVARCHAR}, #{notice,jdbcType=LONGVARCHAR},
|
#{images,jdbcType=LONGVARCHAR}, #{video,jdbcType=LONGVARCHAR}, #{notice,jdbcType=LONGVARCHAR},
|
||||||
#{groupSnap,jdbcType=LONGVARCHAR}, #{specInfo,jdbcType=LONGVARCHAR}, #{selectSpec,jdbcType=LONGVARCHAR},
|
#{groupSnap,jdbcType=LONGVARCHAR}, #{specInfo,jdbcType=LONGVARCHAR}, #{selectSpec,jdbcType=LONGVARCHAR},
|
||||||
#{stockNumber,jdbcType=INTEGER}
|
#{stockNumber,jdbcType=INTEGER},#{warnLine,jdbcType=INTEGER}
|
||||||
)
|
)
|
||||||
</insert>
|
</insert>
|
||||||
<insert id="insertSelective" parameterType="com.chaozhanggui.system.cashierservice.entity.TbProductWithBLOBs">
|
<insert id="insertSelective" parameterType="com.chaozhanggui.system.cashierservice.entity.TbProductWithBLOBs">
|
||||||
@@ -351,6 +352,9 @@
|
|||||||
<if test="stockNumber != null">
|
<if test="stockNumber != null">
|
||||||
stock_number,
|
stock_number,
|
||||||
</if>
|
</if>
|
||||||
|
<if test="warnLine != null">
|
||||||
|
warn_line,
|
||||||
|
</if>
|
||||||
</trim>
|
</trim>
|
||||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||||
<if test="id != null">
|
<if test="id != null">
|
||||||
@@ -551,9 +555,12 @@
|
|||||||
<if test="selectSpec != null">
|
<if test="selectSpec != null">
|
||||||
#{selectSpec,jdbcType=LONGVARCHAR},
|
#{selectSpec,jdbcType=LONGVARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="stockNumber != null">
|
<if test="stockNumber != null">
|
||||||
#{stockNumber,jdbcType=INTEGER},
|
#{stockNumber,jdbcType=INTEGER},
|
||||||
</if>
|
</if>
|
||||||
|
<if test="warnLine != null">
|
||||||
|
#{warnLine,jdbcType=INTEGER},
|
||||||
|
</if>
|
||||||
</trim>
|
</trim>
|
||||||
</insert>
|
</insert>
|
||||||
<update id="updateByPrimaryKeySelective" parameterType="com.chaozhanggui.system.cashierservice.entity.TbProductWithBLOBs">
|
<update id="updateByPrimaryKeySelective" parameterType="com.chaozhanggui.system.cashierservice.entity.TbProductWithBLOBs">
|
||||||
@@ -754,80 +761,84 @@
|
|||||||
<if test="selectSpec != null">
|
<if test="selectSpec != null">
|
||||||
select_spec = #{selectSpec,jdbcType=LONGVARCHAR},
|
select_spec = #{selectSpec,jdbcType=LONGVARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="stockNumber != null">
|
<if test="stockNumber != null">
|
||||||
stock_number = #{stockNumber,jdbcType=INTEGER},
|
stock_number = #{stockNumber,jdbcType=INTEGER},
|
||||||
</if>
|
</if>
|
||||||
|
<if test="warnLine != null">
|
||||||
|
warn_line = #{warnLine,jdbcType=INTEGER},
|
||||||
|
</if>
|
||||||
</set>
|
</set>
|
||||||
where id = #{id,jdbcType=INTEGER}
|
where id = #{id,jdbcType=INTEGER}
|
||||||
</update>
|
</update>
|
||||||
<update id="updateByPrimaryKeyWithBLOBs" parameterType="com.chaozhanggui.system.cashierservice.entity.TbProductWithBLOBs">
|
<update id="updateByPrimaryKeyWithBLOBs" parameterType="com.chaozhanggui.system.cashierservice.entity.TbProductWithBLOBs">
|
||||||
update tb_product
|
update tb_product
|
||||||
set category_id = #{categoryId,jdbcType=VARCHAR},
|
set category_id = #{categoryId,jdbcType=VARCHAR},
|
||||||
spec_id = #{specId,jdbcType=INTEGER},
|
spec_id = #{specId,jdbcType=INTEGER},
|
||||||
source_path = #{sourcePath,jdbcType=VARCHAR},
|
source_path = #{sourcePath,jdbcType=VARCHAR},
|
||||||
brand_id = #{brandId,jdbcType=INTEGER},
|
brand_id = #{brandId,jdbcType=INTEGER},
|
||||||
merchant_id = #{merchantId,jdbcType=VARCHAR},
|
merchant_id = #{merchantId,jdbcType=VARCHAR},
|
||||||
shop_id = #{shopId,jdbcType=VARCHAR},
|
shop_id = #{shopId,jdbcType=VARCHAR},
|
||||||
name = #{name,jdbcType=VARCHAR},
|
name = #{name,jdbcType=VARCHAR},
|
||||||
short_title = #{shortTitle,jdbcType=VARCHAR},
|
short_title = #{shortTitle,jdbcType=VARCHAR},
|
||||||
type = #{type,jdbcType=VARCHAR},
|
type = #{type,jdbcType=VARCHAR},
|
||||||
pack_fee = #{packFee,jdbcType=DECIMAL},
|
pack_fee = #{packFee,jdbcType=DECIMAL},
|
||||||
low_price = #{lowPrice,jdbcType=DECIMAL},
|
low_price = #{lowPrice,jdbcType=DECIMAL},
|
||||||
low_member_price = #{lowMemberPrice,jdbcType=DECIMAL},
|
low_member_price = #{lowMemberPrice,jdbcType=DECIMAL},
|
||||||
unit_id = #{unitId,jdbcType=VARCHAR},
|
unit_id = #{unitId,jdbcType=VARCHAR},
|
||||||
unit_snap = #{unitSnap,jdbcType=VARCHAR},
|
unit_snap = #{unitSnap,jdbcType=VARCHAR},
|
||||||
cover_img = #{coverImg,jdbcType=VARCHAR},
|
cover_img = #{coverImg,jdbcType=VARCHAR},
|
||||||
share_img = #{shareImg,jdbcType=VARCHAR},
|
share_img = #{shareImg,jdbcType=VARCHAR},
|
||||||
video_cover_img = #{videoCoverImg,jdbcType=VARCHAR},
|
video_cover_img = #{videoCoverImg,jdbcType=VARCHAR},
|
||||||
sort = #{sort,jdbcType=INTEGER},
|
sort = #{sort,jdbcType=INTEGER},
|
||||||
limit_number = #{limitNumber,jdbcType=INTEGER},
|
limit_number = #{limitNumber,jdbcType=INTEGER},
|
||||||
product_score = #{productScore,jdbcType=INTEGER},
|
product_score = #{productScore,jdbcType=INTEGER},
|
||||||
status = #{status,jdbcType=TINYINT},
|
status = #{status,jdbcType=TINYINT},
|
||||||
fail_msg = #{failMsg,jdbcType=VARCHAR},
|
fail_msg = #{failMsg,jdbcType=VARCHAR},
|
||||||
is_recommend = #{isRecommend,jdbcType=TINYINT},
|
is_recommend = #{isRecommend,jdbcType=TINYINT},
|
||||||
is_hot = #{isHot,jdbcType=TINYINT},
|
is_hot = #{isHot,jdbcType=TINYINT},
|
||||||
is_new = #{isNew,jdbcType=TINYINT},
|
is_new = #{isNew,jdbcType=TINYINT},
|
||||||
is_on_sale = #{isOnSale,jdbcType=TINYINT},
|
is_on_sale = #{isOnSale,jdbcType=TINYINT},
|
||||||
is_show = #{isShow,jdbcType=TINYINT},
|
is_show = #{isShow,jdbcType=TINYINT},
|
||||||
type_enum = #{typeEnum,jdbcType=VARCHAR},
|
type_enum = #{typeEnum,jdbcType=VARCHAR},
|
||||||
is_distribute = #{isDistribute,jdbcType=TINYINT},
|
is_distribute = #{isDistribute,jdbcType=TINYINT},
|
||||||
is_del = #{isDel,jdbcType=TINYINT},
|
is_del = #{isDel,jdbcType=TINYINT},
|
||||||
is_stock = #{isStock,jdbcType=TINYINT},
|
is_stock = #{isStock,jdbcType=TINYINT},
|
||||||
is_pause_sale = #{isPauseSale,jdbcType=TINYINT},
|
is_pause_sale = #{isPauseSale,jdbcType=TINYINT},
|
||||||
is_free_freight = #{isFreeFreight,jdbcType=TINYINT},
|
is_free_freight = #{isFreeFreight,jdbcType=TINYINT},
|
||||||
freight_id = #{freightId,jdbcType=BIGINT},
|
freight_id = #{freightId,jdbcType=BIGINT},
|
||||||
strategy_type = #{strategyType,jdbcType=VARCHAR},
|
strategy_type = #{strategyType,jdbcType=VARCHAR},
|
||||||
strategy_id = #{strategyId,jdbcType=INTEGER},
|
strategy_id = #{strategyId,jdbcType=INTEGER},
|
||||||
is_vip = #{isVip,jdbcType=TINYINT},
|
is_vip = #{isVip,jdbcType=TINYINT},
|
||||||
is_delete = #{isDelete,jdbcType=TINYINT},
|
is_delete = #{isDelete,jdbcType=TINYINT},
|
||||||
created_at = #{createdAt,jdbcType=BIGINT},
|
created_at = #{createdAt,jdbcType=BIGINT},
|
||||||
updated_at = #{updatedAt,jdbcType=BIGINT},
|
updated_at = #{updatedAt,jdbcType=BIGINT},
|
||||||
base_sales_number = #{baseSalesNumber,jdbcType=DOUBLE},
|
base_sales_number = #{baseSalesNumber,jdbcType=DOUBLE},
|
||||||
real_sales_number = #{realSalesNumber,jdbcType=INTEGER},
|
real_sales_number = #{realSalesNumber,jdbcType=INTEGER},
|
||||||
sales_number = #{salesNumber,jdbcType=INTEGER},
|
sales_number = #{salesNumber,jdbcType=INTEGER},
|
||||||
thumb_count = #{thumbCount,jdbcType=INTEGER},
|
thumb_count = #{thumbCount,jdbcType=INTEGER},
|
||||||
store_count = #{storeCount,jdbcType=INTEGER},
|
store_count = #{storeCount,jdbcType=INTEGER},
|
||||||
furnish_meal = #{furnishMeal,jdbcType=INTEGER},
|
furnish_meal = #{furnishMeal,jdbcType=INTEGER},
|
||||||
furnish_express = #{furnishExpress,jdbcType=INTEGER},
|
furnish_express = #{furnishExpress,jdbcType=INTEGER},
|
||||||
furnish_draw = #{furnishDraw,jdbcType=INTEGER},
|
furnish_draw = #{furnishDraw,jdbcType=INTEGER},
|
||||||
furnish_vir = #{furnishVir,jdbcType=INTEGER},
|
furnish_vir = #{furnishVir,jdbcType=INTEGER},
|
||||||
is_combo = #{isCombo,jdbcType=TINYINT},
|
is_combo = #{isCombo,jdbcType=TINYINT},
|
||||||
is_show_cash = #{isShowCash,jdbcType=TINYINT},
|
is_show_cash = #{isShowCash,jdbcType=TINYINT},
|
||||||
is_show_mall = #{isShowMall,jdbcType=TINYINT},
|
is_show_mall = #{isShowMall,jdbcType=TINYINT},
|
||||||
is_need_examine = #{isNeedExamine,jdbcType=TINYINT},
|
is_need_examine = #{isNeedExamine,jdbcType=TINYINT},
|
||||||
show_on_mall_status = #{showOnMallStatus,jdbcType=TINYINT},
|
show_on_mall_status = #{showOnMallStatus,jdbcType=TINYINT},
|
||||||
show_on_mall_time = #{showOnMallTime,jdbcType=BIGINT},
|
show_on_mall_time = #{showOnMallTime,jdbcType=BIGINT},
|
||||||
show_on_mall_error_msg = #{showOnMallErrorMsg,jdbcType=VARCHAR},
|
show_on_mall_error_msg = #{showOnMallErrorMsg,jdbcType=VARCHAR},
|
||||||
enable_label = #{enableLabel,jdbcType=TINYINT},
|
enable_label = #{enableLabel,jdbcType=TINYINT},
|
||||||
tax_config_id = #{taxConfigId,jdbcType=VARCHAR},
|
tax_config_id = #{taxConfigId,jdbcType=VARCHAR},
|
||||||
spec_table_headers = #{specTableHeaders,jdbcType=VARCHAR},
|
spec_table_headers = #{specTableHeaders,jdbcType=VARCHAR},
|
||||||
images = #{images,jdbcType=LONGVARCHAR},
|
images = #{images,jdbcType=LONGVARCHAR},
|
||||||
video = #{video,jdbcType=LONGVARCHAR},
|
video = #{video,jdbcType=LONGVARCHAR},
|
||||||
notice = #{notice,jdbcType=LONGVARCHAR},
|
notice = #{notice,jdbcType=LONGVARCHAR},
|
||||||
group_snap = #{groupSnap,jdbcType=LONGVARCHAR},
|
group_snap = #{groupSnap,jdbcType=LONGVARCHAR},
|
||||||
spec_info = #{specInfo,jdbcType=LONGVARCHAR},
|
spec_info = #{specInfo,jdbcType=LONGVARCHAR},
|
||||||
select_spec = #{selectSpec,jdbcType=LONGVARCHAR},
|
select_spec = #{selectSpec,jdbcType=LONGVARCHAR},
|
||||||
stock_number = #{stockNumber,jdbcType=INTEGER}
|
stock_number = #{stockNumber,jdbcType=INTEGER},
|
||||||
|
warn_line = #{warnLine,jdbcType=INTEGER}
|
||||||
where id = #{id,jdbcType=INTEGER}
|
where id = #{id,jdbcType=INTEGER}
|
||||||
</update>
|
</update>
|
||||||
<update id="updateByPrimaryKey" parameterType="com.chaozhanggui.system.cashierservice.entity.TbProduct">
|
<update id="updateByPrimaryKey" parameterType="com.chaozhanggui.system.cashierservice.entity.TbProduct">
|
||||||
@@ -891,7 +902,8 @@
|
|||||||
enable_label = #{enableLabel,jdbcType=TINYINT},
|
enable_label = #{enableLabel,jdbcType=TINYINT},
|
||||||
tax_config_id = #{taxConfigId,jdbcType=VARCHAR},
|
tax_config_id = #{taxConfigId,jdbcType=VARCHAR},
|
||||||
spec_table_headers = #{specTableHeaders,jdbcType=VARCHAR},
|
spec_table_headers = #{specTableHeaders,jdbcType=VARCHAR},
|
||||||
stock_number = #{stockNumber,jdbcType=INTEGER}
|
stock_number = #{stockNumber,jdbcType=INTEGER},
|
||||||
|
warn_line = #{warnLine,jdbcType=INTEGER}
|
||||||
where id = #{id,jdbcType=INTEGER}
|
where id = #{id,jdbcType=INTEGER}
|
||||||
</update>
|
</update>
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,6 @@
|
|||||||
<result column="strategy_price" jdbcType="DECIMAL" property="strategyPrice" />
|
<result column="strategy_price" jdbcType="DECIMAL" property="strategyPrice" />
|
||||||
<result column="stock_number" jdbcType="DOUBLE" property="stockNumber" />
|
<result column="stock_number" jdbcType="DOUBLE" property="stockNumber" />
|
||||||
<result column="cover_img" jdbcType="VARCHAR" property="coverImg" />
|
<result column="cover_img" jdbcType="VARCHAR" property="coverImg" />
|
||||||
<result column="warn_line" jdbcType="INTEGER" property="warnLine" />
|
|
||||||
<result column="suit" jdbcType="INTEGER" property="suit" />
|
<result column="suit" jdbcType="INTEGER" property="suit" />
|
||||||
<result column="weight" jdbcType="DOUBLE" property="weight" />
|
<result column="weight" jdbcType="DOUBLE" property="weight" />
|
||||||
<result column="volume" jdbcType="REAL" property="volume" />
|
<result column="volume" jdbcType="REAL" property="volume" />
|
||||||
@@ -54,7 +53,7 @@
|
|||||||
product_id, origin_price, cost_price,
|
product_id, origin_price, cost_price,
|
||||||
member_price, meal_price, sale_price,
|
member_price, meal_price, sale_price,
|
||||||
guide_price, strategy_price, stock_number,
|
guide_price, strategy_price, stock_number,
|
||||||
cover_img, warn_line, weight,
|
cover_img, weight,
|
||||||
volume, real_sales_number, first_shared,
|
volume, real_sales_number, first_shared,
|
||||||
second_shared, created_at, updated_at,
|
second_shared, created_at, updated_at,
|
||||||
spec_info, spec_snap)
|
spec_info, spec_snap)
|
||||||
@@ -62,7 +61,7 @@
|
|||||||
#{productId,jdbcType=VARCHAR}, #{originPrice,jdbcType=DECIMAL}, #{costPrice,jdbcType=DECIMAL},
|
#{productId,jdbcType=VARCHAR}, #{originPrice,jdbcType=DECIMAL}, #{costPrice,jdbcType=DECIMAL},
|
||||||
#{memberPrice,jdbcType=DECIMAL}, #{mealPrice,jdbcType=DECIMAL}, #{salePrice,jdbcType=DECIMAL},
|
#{memberPrice,jdbcType=DECIMAL}, #{mealPrice,jdbcType=DECIMAL}, #{salePrice,jdbcType=DECIMAL},
|
||||||
#{guidePrice,jdbcType=DECIMAL}, #{strategyPrice,jdbcType=DECIMAL}, #{stockNumber,jdbcType=DOUBLE},
|
#{guidePrice,jdbcType=DECIMAL}, #{strategyPrice,jdbcType=DECIMAL}, #{stockNumber,jdbcType=DOUBLE},
|
||||||
#{coverImg,jdbcType=VARCHAR}, #{warnLine,jdbcType=INTEGER}, #{weight,jdbcType=DOUBLE},
|
#{coverImg,jdbcType=VARCHAR}, #{weight,jdbcType=DOUBLE},
|
||||||
#{volume,jdbcType=REAL}, #{realSalesNumber,jdbcType=DOUBLE}, #{firstShared,jdbcType=DECIMAL},
|
#{volume,jdbcType=REAL}, #{realSalesNumber,jdbcType=DOUBLE}, #{firstShared,jdbcType=DECIMAL},
|
||||||
#{secondShared,jdbcType=DECIMAL}, #{createdAt,jdbcType=BIGINT}, #{updatedAt,jdbcType=BIGINT},
|
#{secondShared,jdbcType=DECIMAL}, #{createdAt,jdbcType=BIGINT}, #{updatedAt,jdbcType=BIGINT},
|
||||||
#{specInfo,jdbcType=LONGVARCHAR}, #{specSnap,jdbcType=LONGVARCHAR})
|
#{specInfo,jdbcType=LONGVARCHAR}, #{specSnap,jdbcType=LONGVARCHAR})
|
||||||
@@ -109,9 +108,6 @@
|
|||||||
<if test="coverImg != null">
|
<if test="coverImg != null">
|
||||||
cover_img,
|
cover_img,
|
||||||
</if>
|
</if>
|
||||||
<if test="warnLine != null">
|
|
||||||
warn_line,
|
|
||||||
</if>
|
|
||||||
<if test="weight != null">
|
<if test="weight != null">
|
||||||
weight,
|
weight,
|
||||||
</if>
|
</if>
|
||||||
@@ -180,9 +176,6 @@
|
|||||||
<if test="coverImg != null">
|
<if test="coverImg != null">
|
||||||
#{coverImg,jdbcType=VARCHAR},
|
#{coverImg,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="warnLine != null">
|
|
||||||
#{warnLine,jdbcType=INTEGER},
|
|
||||||
</if>
|
|
||||||
<if test="weight != null">
|
<if test="weight != null">
|
||||||
#{weight,jdbcType=DOUBLE},
|
#{weight,jdbcType=DOUBLE},
|
||||||
</if>
|
</if>
|
||||||
@@ -251,9 +244,6 @@
|
|||||||
<if test="coverImg != null">
|
<if test="coverImg != null">
|
||||||
cover_img = #{coverImg,jdbcType=VARCHAR},
|
cover_img = #{coverImg,jdbcType=VARCHAR},
|
||||||
</if>
|
</if>
|
||||||
<if test="warnLine != null">
|
|
||||||
warn_line = #{warnLine,jdbcType=INTEGER},
|
|
||||||
</if>
|
|
||||||
<if test="weight != null">
|
<if test="weight != null">
|
||||||
weight = #{weight,jdbcType=DOUBLE},
|
weight = #{weight,jdbcType=DOUBLE},
|
||||||
</if>
|
</if>
|
||||||
@@ -298,7 +288,6 @@
|
|||||||
strategy_price = #{strategyPrice,jdbcType=DECIMAL},
|
strategy_price = #{strategyPrice,jdbcType=DECIMAL},
|
||||||
stock_number = #{stockNumber,jdbcType=DOUBLE},
|
stock_number = #{stockNumber,jdbcType=DOUBLE},
|
||||||
cover_img = #{coverImg,jdbcType=VARCHAR},
|
cover_img = #{coverImg,jdbcType=VARCHAR},
|
||||||
warn_line = #{warnLine,jdbcType=INTEGER},
|
|
||||||
weight = #{weight,jdbcType=DOUBLE},
|
weight = #{weight,jdbcType=DOUBLE},
|
||||||
volume = #{volume,jdbcType=REAL},
|
volume = #{volume,jdbcType=REAL},
|
||||||
real_sales_number = #{realSalesNumber,jdbcType=DOUBLE},
|
real_sales_number = #{realSalesNumber,jdbcType=DOUBLE},
|
||||||
@@ -324,7 +313,6 @@
|
|||||||
strategy_price = #{strategyPrice,jdbcType=DECIMAL},
|
strategy_price = #{strategyPrice,jdbcType=DECIMAL},
|
||||||
stock_number = #{stockNumber,jdbcType=DOUBLE},
|
stock_number = #{stockNumber,jdbcType=DOUBLE},
|
||||||
cover_img = #{coverImg,jdbcType=VARCHAR},
|
cover_img = #{coverImg,jdbcType=VARCHAR},
|
||||||
warn_line = #{warnLine,jdbcType=INTEGER},
|
|
||||||
weight = #{weight,jdbcType=DOUBLE},
|
weight = #{weight,jdbcType=DOUBLE},
|
||||||
volume = #{volume,jdbcType=REAL},
|
volume = #{volume,jdbcType=REAL},
|
||||||
real_sales_number = #{realSalesNumber,jdbcType=DOUBLE},
|
real_sales_number = #{realSalesNumber,jdbcType=DOUBLE},
|
||||||
|
|||||||
Reference in New Issue
Block a user