商品增加规格描述

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/CouponMgrController.java

@@ -67,13 +67,13 @@ public class CouponMgrController extends BaseApiController {
 
 	@Autowired
 	private ICouponTicketService couponTicketService;
-	
+
 	@Autowired
 	private ITicketBoxService ticketBoxService;
-	
+
 	@Autowired
 	private ICouponChannelService couponChannelService;
-	
+
 	@Autowired
 	private IChannelService channelService;
 
@@ -102,8 +102,8 @@ public class CouponMgrController extends BaseApiController {
 		list = couponService.list(queryWrapper);
 		return getDataTable(list);
 	}
-	
-	
+
+
 	/**
 	 * 获取代金券详情信息
 	 *
@@ -116,8 +116,8 @@ public class CouponMgrController extends BaseApiController {
 	    if (StringUtils.isBlank(couponId)){
 	      return error(ErrorCodeEnum.ERROR_CODE_1001);
 	    }
-	    Coupon coupon = couponService.getById(couponId);
-		if(null == coupon || StringUtils.isBlank(coupon.getCouponId())) {
+	    Coupon coupon = couponService.getById(Long.valueOf(couponId));
+		if(null == coupon) {
 			 return error(ErrorCodeEnum.ERROR_CODE_1001);
 		}
 		CouponVO couponVO = new CouponVO();
@@ -190,7 +190,7 @@ public class CouponMgrController extends BaseApiController {
 	        	ticketList.add(couponTicket);
 	        }
 		}
-//		if(coupon.getUseArea() != CouponUseAreaEnum.COMMON 
+//		if(coupon.getUseArea() != CouponUseAreaEnum.COMMON
 //				&& ticketList.size() == 0) {
 //			return AjaxResult.error("使用范围为指定盲票时需要至少选择一种盲票");
 //		}
@@ -268,15 +268,15 @@ public class CouponMgrController extends BaseApiController {
 			return error(ErrorCodeEnum.ERROR_CODE_1001);
 		}
 		try {
-			couponService.lambdaUpdate().set(Coupon::getStatus, CouponStatusEnum.PUT_ON.getValue().equals(status)?CouponStatusEnum.PUT_ON:CouponStatusEnum.PUT_OFF).eq(Coupon::getCouponId, couponId).update();
+			couponService.lambdaUpdate().set(Coupon::getStatus, CouponStatusEnum.PUT_ON.getValue().equals(status)?CouponStatusEnum.PUT_ON:CouponStatusEnum.PUT_OFF).eq(Coupon::getCouponId, Long.valueOf(couponId)).update();
 			// 查询代金券信息
 		} catch (Exception e) {
 			return AjaxResult.error("操作失败");
 		}
 		return AjaxResult.success("操作成功");
 	}
-	
-	
+
+
 	/**
 	 * 删除代金券商品(假删)
 	 *
@@ -289,8 +289,8 @@ public class CouponMgrController extends BaseApiController {
 	    if (StringUtils.isBlank(couponId)){
 	      return error(ErrorCodeEnum.ERROR_CODE_1001);
 	    }
-	    Coupon coupon = couponService.getById(couponId);
-		if(null == coupon || StringUtils.isBlank(coupon.getCouponId())) {
+	    Coupon coupon = couponService.getById(Long.valueOf(couponId));
+		if(null == coupon) {
 			 return error(ErrorCodeEnum.ERROR_CODE_1001);
 		}
 		// 商品未下架， 不允许删除

mp-service/src/main/java/com/qs/mp/admin/domain/Coupon.java

@@ -30,8 +30,8 @@ public class Coupon implements Serializable {
   /**
    * 主键
    */
-  @TableId(value = "coupon_id", type = IdType.INPUT)
-  private String couponId;
+  @TableId(value = "coupon_id", type = IdType.AUTO)
+  private Long couponId;
 
   /**
    * 标题
@@ -94,7 +94,7 @@ public class Coupon implements Serializable {
   /**
    * 使用范围;0通用 1生成券时指定范围 2发放时动态指定范围
    *         0：进票门店  1、指定盲票  2：所有门票
-   *         
+   *
    */
   @TableField("use_area")
   @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
@@ -149,7 +149,7 @@ public class Coupon implements Serializable {
   @TableField("is_deleted")
   @TableLogic
   private Integer isDeleted;
-  
+
   /**
    * 创建时间
    */

mp-service/src/main/java/com/qs/mp/admin/domain/CouponTicket.java

@@ -29,7 +29,7 @@ public class CouponTicket implements Serializable {
    * 优惠券ID
    */
   @TableField("coupon_id")
-  private String couponId;
+  private Long couponId;
 
   /**
    * 盲票组ID

mp-service/src/main/java/com/qs/mp/admin/domain/Goods.java

@@ -102,6 +102,12 @@ public class Goods implements Serializable {
   @TableField("multi_sku")
   private Integer multiSku;
 
+  /**
+   * 规格描述
+   */
+  @TableField("sku_prop")
+  private String skuProp;
+
 
   /**
    * 上架状态;上架/下架

mp-service/src/main/java/com/qs/mp/admin/service/impl/CouponServiceImpl.java

@@ -114,7 +114,6 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
   @Override
 	@Transactional
 	public void saveCoupon(Coupon coupon, List<CouponTicket> ticketList) {
-	   coupon.setCouponId(bizIdGenerator.newId());
 		boolean res = couponService.save(coupon);
 		if(!res) {
 			throw new ServiceException("请联系管理员");

mp-service/src/main/java/com/qs/mp/user/domain/UserCoupon.java

@@ -45,7 +45,7 @@ public class UserCoupon implements Serializable {
    * 优惠券ID
    */
   @TableField("coupon_id")
-  private String couponId;
+  private Long couponId;
 
   /**
    * 生效日

mp-service/src/main/resources/mapper/admin/GoodsMapper.xml

@@ -18,6 +18,7 @@
         <result column="status" property="status" />
         <result column="exchange_show" property="exchangeShow" />
         <result column="multi_sku" property="multiSku" />
+        <result column="sku_prop" property="skuProp" />
         <result column="is_deleted" property="isDeleted" />
         <result column="created_time" property="createdTime" />
         <result column="updated_time" property="updatedTime" />
@@ -25,7 +26,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        goods_id, title, category_id, pic_url, description, origin_price, exchange_price, value, cost, quantity, exchanged_qty, status, exchange_show, multi_sku, is_deleted, created_time, updated_time
+        goods_id, title, category_id, pic_url, description, origin_price, exchange_price, value, cost, quantity, exchanged_qty, status, exchange_show, multi_sku, sku_prop, is_deleted, created_time, updated_time
     </sql>
 
 </mapper>