Merge remote-tracking branch 'origin/hph'

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbConsInfoFlow.java

@@ -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;
     }

src/main/java/com/chaozhanggui/system/cashierservice/service/ConsService.java

@@ -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()));
 

src/main/resources/mapper/TbConsInfoFlowMapper.xml

@@ -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})