clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into refund

This commit is contained in:
HH 2023-04-08 23:26:04 +08:00
parent dd5dc62452 06378c983b
commit 02889ae85f
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ghy-goods/src/main/java/com/ghy/goods/service/impl/GoodsServiceImpl.java
View File

@ -180,6 +180,9 @@ public class GoodsServiceImpl implements GoodsService {
if (goodsStandard.getExtMoney() == null) {
goodsStandard.setExtMoney(BigDecimal.ZERO);
}
if (goodsStandard.getGroupPrice() == null) {
goodsStandard.setGroupPrice(BigDecimal.ZERO);
}
});
// 批量删除各组件

1
ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml
View File

@ -43,6 +43,7 @@
UPDATE goods
<set>
<if test="goodsName != null and goodsName != ''">goods_name = #{goodsName},</if>
<if test="goodsDesc != null and goodsDesc != ''">goods_desc = #{goodsDesc},</if>
<if test="goodsSort != null and goodsSort != ''">goods_sort = #{goodsSort},</if>
<if test="deptGoodsCategoryId != null and deptGoodsCategoryId != ''">dept_goods_category_id = #{deptGoodsCategoryId},</if>
<if test="goodsImgUrl != null and goodsImgUrl != ''">goods_img_url = #{goodsImgUrl},</if>

3
ghy-goods/src/main/resources/mapper/goods/GoodsStandardMapper.xml
View File

@ -122,7 +122,8 @@
<if test="extMoney != null">ext_money = #{extMoney},</if>
<if test="discountPrice != null">discount_price = #{discountPrice},</if>
<if test="groupPrice != null">group_price = #{groupPrice},</if>
<if test="goodsUnit != null and goodsUnit != ''">goods_unit = #{goodsUnit},</if>
<if test="goodsUnit != null">goods_unit = #{goodsUnit},</if>
<if test="goodsNum != null">goods_num = #{goodsNum},</if>
<if test="status != null">`status` = #{status},</if>
<if test="remark != null">remark = #{remark},</if>
update_time = sysdate()