czg_team
/
cashier-client
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/hph'

This commit is contained in:
韩鹏辉 2024-07-05 16:37:45 +08:00
parent cbb0276958 b9fd6aed7a
commit d32f868397
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/chaozhanggui/system/cashierservice/entity/TbConsInfoFlow.java
View File

@ -11,6 +11,8 @@ public class TbConsInfoFlow implements Serializable {
private Integer consId;
private Integer proSkuId;
private String conName;
private BigDecimal amount;
@ -53,6 +55,14 @@ public class TbConsInfoFlow implements Serializable {
this.consId = consId;
}
public Integer getProSkuId() {
return proSkuId;
}
public void setProSkuId(Integer proSkuId) {
this.proSkuId = proSkuId;
}
public String getConName() {
return conName;
}

1
src/main/java/com/chaozhanggui/system/cashierservice/service/ConsService.java
View File

@ -70,6 +70,7 @@ public class ConsService {
flow.setConsId(tbConsInfo.getId());
flow.setShopId(tbConsInfo.getShopId());
flow.setConName(tbConsInfo.getConName());
flow.setProSkuId(proskuCon.getProductSkuId());
if("create".equals(type)){
amount=proskuCon.getSurplusStock().multiply(new BigDecimal(orderDetail.getNum()));

5
src/main/resources/mapper/TbConsInfoFlowMapper.xml
View File

@ -5,6 +5,7 @@
<id column="id" jdbcType="INTEGER" property="id" />
<result column="shop_id" jdbcType="INTEGER" property="shopId" />
<result column="cons_id" jdbcType="INTEGER" property="consId" />
<result column="pro_sku_id" jdbcType="INTEGER" property="proSkuId" />
<result column="con_name" jdbcType="VARCHAR" property="conName" />
<result column="amount" jdbcType="DECIMAL" property="amount" />
<result column="balance" jdbcType="DECIMAL" property="balance" />
@ -29,11 +30,11 @@
where id = #{id,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.chaozhanggui.system.cashierservice.entity.TbConsInfoFlow">
insert into tb_cons_info_flow (id, shop_id, cons_id,
insert into tb_cons_info_flow (id, shop_id, cons_id, pro_sku_id,
con_name, amount, balance,
biz_code, biz_name, biz_type,
create_time, update_time)
values (#{id,jdbcType=INTEGER}, #{shopId,jdbcType=INTEGER}, #{consId,jdbcType=INTEGER},
values (#{id,jdbcType=INTEGER}, #{shopId,jdbcType=INTEGER}, #{consId,jdbcType=INTEGER}, #{proSkuId,jdbcType=INTEGER},
#{conName,jdbcType=VARCHAR}, #{amount,jdbcType=DECIMAL}, #{balance,jdbcType=DECIMAL},
#{bizCode,jdbcType=VARCHAR}, #{bizName,jdbcType=VARCHAR}, #{bizType,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})