update:购物车增加是否选中字段

fengliang
1 parent 958340f3
Showing 6 changed files with 102 additions and 6 deletions
etrade-order/src/main/java/com/diligrp/etrade/order/domain/ShopCartMessageDto.java
etrade-order/src/main/java/com/diligrp/etrade/order/model/ShopCartMessage.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderServiceImpl.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/ShopCartImpl.java
etrade-order/src/main/java/com/diligrp/etrade/order/type/ShopCartMessageCheckFlag.java
etrade-order/src/main/resources/com/diligrp/etrade/dao/mapper/shopCart/ShopCartMessageMapper.xml
@@ -89,6 +89,9 @@ public class ShopCartMessageDto implements Serializable {
      */
     private LocalDateTime cacheTime;
  
+    /** 选中状态 */
+    private Integer checkFlag;
+
     public LocalDateTime getCacheTime() {
         return cacheTime;
     }
@@ -199,4 +202,12 @@ public class ShopCartMessageDto implements Serializable {
     public void setCreaterId(Long createrId) {
         this.createrId = createrId;
     }
+
+    public Integer getCheckFlag() {
+        return checkFlag;
+    }
+
+    public void setCheckFlag(Integer checkFlag) {
+        this.checkFlag = checkFlag;
+    }
 }
@@ -85,6 +85,9 @@ public class ShopCartMessage extends BaseDo implements Serializable {
      */
     private Long createrId;
  
+    /** 选中状态 */
+    private Integer checkFlag;
+
  
     private static final long serialVersionUID = 1L;
  
@@ -234,7 +237,8 @@ public class ShopCartMessage extends BaseDo implements Serializable {
             && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType()))
             && (this.getVersion() == null ? other.getVersion() == null : this.getVersion().equals(other.getVersion()))
             && (this.getCreater() == null ? other.getCreater() == null : this.getCreater().equals(other.getCreater()))
-            && (this.getCreaterId() == null ? other.getCreaterId() == null : this.getCreaterId().equals(other.getCreaterId()));
+            && (this.getCreaterId() == null ? other.getCreaterId() == null : this.getCreaterId().equals(other.getCreaterId()))
+            && (this.getCheckFlag() == null ? other.getCheckFlag() == null : this.getCheckFlag().equals(other.getCheckFlag()));
     }
  
     @Override
@@ -256,6 +260,7 @@ public class ShopCartMessage extends BaseDo implements Serializable {
         result = prime * result + ((getVersion() == null) ? 0 : getVersion().hashCode());
         result = prime * result + ((getCreater() == null) ? 0 : getCreater().hashCode());
         result = prime * result + ((getCreaterId() == null) ? 0 : getCreaterId().hashCode());
+        result = prime * result + ((getCheckFlag() == null) ? 0 : getCheckFlag().hashCode());
         return result;
     }
  
@@ -280,8 +285,25 @@ public class ShopCartMessage extends BaseDo implements Serializable {
         sb.append(", version=").append(version);
         sb.append(", creater=").append(creater);
         sb.append(", createrId=").append(createrId);
+        sb.append(", checkFlag=").append(checkFlag);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();
     }
+
+    public Integer getCheckFlag() {
+        return checkFlag;
+    }
+
+    public void setCheckFlag(Integer checkFlag) {
+        this.checkFlag = checkFlag;
+    }
+
+    public Long getShopCartId() {
+        return shopCartId;
+    }
+
+    public void setShopCartId(Long shopCartId) {
+        this.shopCartId = shopCartId;
+    }
 }
 \ No newline at end of file
@@ -362,7 +362,7 @@ public class OrderServiceImpl implements OrderService {
         //插入订单商品 并计算卖家费用
         List<OrderGoods> orderGoods = orderGoodsService.buildOrderGoods(order,buyerOrderDto.getProductDtoList());
         //插入订单商品买方手续费
-        orderPaymentFeeService.buildSellerPaymentFees(order,orderGoods,YesOrNoEnum.NO.getCode());
+        //orderPaymentFeeService.buildSellerPaymentFees(order,orderGoods,YesOrNoEnum.NO.getCode());
  
         orderMapper.updateOrderOtherById(order);
         //配送信息
@@ -14,6 +14,7 @@ import com.diligrp.etrade.order.model.ShopCart;
 import com.diligrp.etrade.order.model.ShopCartMessage;
 import com.diligrp.etrade.order.service.IShopCartMessageService;
 import com.diligrp.etrade.order.service.IShopCartService;
+import com.diligrp.etrade.order.type.ShopCartMessageCheckFlag;
 import com.diligrp.etrade.order.type.ShopCartMessageProductState;
 import com.diligrp.etrade.shop.domain.response.ProductListVo;
 import com.diligrp.etrade.shop.domain.response.ProductPresetVo;
@@ -188,6 +189,7 @@ public class ShopCartImpl implements IShopCartService {
             int in = shopCartMapper.insertSelective(shopCart);
             Assert.isTrue(in > 0, "购物车添加失败");
             shopCartMessageDto.setShopCartId(shopCart.getId());
+            shopCartMessageDto.setCheckFlag(ShopCartMessageCheckFlag.CHECK.getCodeInteger());
             shopCartMessageService.saveShopCartMessage(shopCartMessageDto);
             return;
         }
+package com.diligrp.etrade.order.type;
+
+import com.diligrp.etrade.core.type.IEnumType;
+
+public enum ShopCartMessageCheckFlag implements IEnumType {
+    CHECK("选中", 1),
+    UN_CHECK("未选中", 2);
+
+    private String name;
+    private Integer code;
+
+    private ShopCartMessageCheckFlag(String name, Integer code) {
+        this.name = name;
+        this.code = code;
+    }
+
+    public static ShopCartMessageCheckFlag getByCode(Integer code) {
+        for (ShopCartMessageCheckFlag temp : ShopCartMessageCheckFlag.values()) {
+            if (temp.getCodeInteger().equals(code)) {
+                return temp;
+            }
+        }
+        return null;
+    }
+
+    public static String getNameByCode(Integer code) {
+        for (ShopCartMessageCheckFlag temp : ShopCartMessageCheckFlag.values()) {
+            if (temp.getCodeInteger().equals(code)) {
+                return temp.getName();
+            }
+        }
+        return null;
+    }
+
+    public Integer getCodeInteger() {
+        return this.code;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public int getCode() {
+        return this.code;
+    }
+
+    public String toString() {
+        return this.name;
+    }
+}
 \ No newline at end of file
@@ -17,11 +17,12 @@
         <result column="version" jdbcType="TINYINT" property="version"/>
         <result column="creater" jdbcType="VARCHAR" property="creater"/>
         <result column="creater_id" jdbcType="BIGINT" property="createrId"/>
+        <result column="check_flag" jdbcType="TINYINT" property="checkFlag"/>
     </resultMap>
     <sql id="Base_Column_List">
         id
         , shop_cart_id, created_time, modified_time, market_id, product_id, `number`,
-    unit_amount, unit_weight, weight, amount, `type`, version, creater, creater_id
+    unit_amount, unit_weight, weight, amount, `type`, version, creater, creater_id,check_flag
     </sql>
     <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
         select
@@ -125,12 +126,12 @@
                                        market_id, product_id, `number`,
                                        unit_amount, unit_weight, weight,
                                        amount, `type`, version,
-                                       creater, creater_id)
+                                       creater, creater_id,check_flag)
         values (#{shopCartId,jdbcType=BIGINT}, #{createdTime,jdbcType=TIMESTAMP}, #{modifiedTime,jdbcType=TIMESTAMP},
                 #{marketId,jdbcType=BIGINT}, #{productId,jdbcType=BIGINT}, #{number,jdbcType=BIGINT},
                 #{unitAmount,jdbcType=BIGINT}, #{unitWeight,jdbcType=BIGINT}, #{weight,jdbcType=BIGINT},
                 #{amount,jdbcType=BIGINT}, #{type,jdbcType=TINYINT}, #{version,jdbcType=TINYINT},
-                #{creater,jdbcType=VARCHAR}, #{createrId,jdbcType=BIGINT})
+                #{creater,jdbcType=VARCHAR}, #{createrId,jdbcType=BIGINT}, #{checkFlag,jdbcType=TINYINT})
     </insert>
     <insert id="insertSelective" keyColumn="id" keyProperty="id"
             parameterType="com.diligrp.etrade.order.model.ShopCartMessage" useGeneratedKeys="true">
@@ -174,6 +175,9 @@
             <if test="createrId != null">
                 creater_id,
             </if>
+            <if test="checkFlag != null">
+                check_flag,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="shopCartId != null">
@@ -214,6 +218,9 @@
             <if test="createrId != null">
                 #{createrId,jdbcType=BIGINT},
             </if>
+            <if test="checkFlag != null">
+                #{checkFlag,jdbcType=TINYINT},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.diligrp.etrade.order.domain.ShopCartMessageDto">
@@ -258,6 +265,9 @@
             <if test="createrId != null">
                 creater_id = #{createrId,jdbcType=BIGINT},
             </if>
+            <if test="checkFlag != null">
+                check_flag = #{checkFlag,jdbcType=TINYINT},
+            </if>
         </set>
         where id = #{id,jdbcType=BIGINT} and version=#{version,jdbcType=TINYINT}
     </update>
@@ -276,7 +286,8 @@
             `type`        = #{type,jdbcType=TINYINT},
             version       = #{version,jdbcType=TINYINT},
             creater       = #{creater,jdbcType=VARCHAR},
-            creater_id    = #{createrId,jdbcType=BIGINT}
+            creater_id    = #{createrId,jdbcType=BIGINT},
+            check_flag    = #{checkFlag,jdbcType=TINYINT}
         where id = #{id,jdbcType=BIGINT}
     </update>
 </mapper>
 \ No newline at end of file