前端：优惠劵列表

mobile-web/src/api/promotion.js

@@ -41,3 +41,15 @@ export function doAddCouponCard(templateId) {
 }
 
 // Coupon Card
+
+export function getCouponPage(status, pageNo, pageSize) {
+  return request({
+    url: '/promotion-api/users/coupon/card/page',
+    method: 'get',
+    params: {
+      status,
+      pageNo,
+      pageSize
+    }
+  });
+}

mobile-web/src/config/env.js

@@ -20,8 +20,8 @@ if (!process.env.NODE_ENV || process.env.NODE_ENV == 'development') {
 
 // baseUrl = 'http://127.0.0.1';
 // baseUrl = 'http://180.167.213.26:18099';
-// dataSources = 'remote';
-dataSources = 'local';
+dataSources = 'remote';
+// dataSources = 'local';
 
 export {
 	baseUrl,

mobile-web/src/config/router.js

 import Vue from 'vue';
 import Router from 'vue-router';
 
+import { getAccessToken } from '../utils/cache';
+
 Vue.use(Router);
 
 const routes = [
@@ -84,7 +86,8 @@ const routes = [
     path: '/user/coupon',
     component: () => import('../page/user/coupon/list'),
     meta: {
-      title: '我的优惠券'
+      title: '我的优惠券',
+      requireAuth: true,
     }
   },
   {
@@ -202,10 +205,23 @@ routes.forEach(route => {
 const router = new Router({ routes });
 
 router.beforeEach((to, from, next) => {
+  // 判断是否需要认证
+  const requireAuth = to.meta && to.meta.requireAuth;
+  if (requireAuth) {
+    if (!getAccessToken()) { // 未登陆
+      next({
+        path: '/login',
+        query: {redirect: to.fullPath}  // 将跳转的路由path作为参数，登录成功后跳转到该路由
+      });
+      return;
+    }
+  }
+  // 处理标题
   const title = to.meta && to.meta.title;
   if (title) {
     document.title = title;
   }
+  // 继续路由
   next();
 });
 

mobile-web/src/main.js

@@ -7,6 +7,8 @@ import VueLazyload from 'vue-lazyload'
 import components from './config/components.js';
 import { Dialog } from 'vant';
 
+import { formatDate } from './utils/date.js';
+
 Vue.use(components);
 
 Vue.use(VueLazyload);
@@ -16,4 +18,10 @@ new Vue({
   router,
   el: '#app',
   render: h => h(App)
-});
+});
\ No newline at end of file
+
+Vue.filter('formatDate', function(date, pattern) {
+  if (date) {
+    return formatDate(date, pattern);
+  }
+});

mobile-web/src/page/account/phonelogin.vue

@@ -73,8 +73,9 @@ export default {
           message: '登陆成功',
           beforeClose: function (action, done) {
             done();
-            // TODO 芋艿，先暂时不做 callback
-            that.$router.push('/user/index');
+            // TODO 芋艿，简单的 callback 后续完善
+            let redirect = that.$route.query.redirect || '/user/index';
+            that.$router.push(redirect);
           }
         });
       });

mobile-web/src/utils/date.js

+
+// TODO 临时代码
+export function formatDate(date, pattern) {
+  if (!(date instanceof Date)) {
+    date = new Date(date);
+  }
+  if (pattern === 'yyyy-MM-dd') {
+    let d = date.getDate();
+    let m = date.getMonth() + 1; //Month from 0 to 11
+    let y = date.getFullYear();
+    return '' + y + '-' + (m <= 9 ? '0' + m : m) + '-' + (d <= 9 ? '0' + d : d);
+  } else {
+    return '暂不支持';
+  }
+}

order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderCreateItemDTO.java

 package cn.iocoder.mall.order.api.dto;
 
+import lombok.Data;
+import lombok.experimental.Accessors;
+
 import javax.validation.constraints.Max;
 import javax.validation.constraints.NotNull;
 
@@ -7,6 +10,8 @@ import javax.validation.constraints.NotNull;
  * @author Sin
  * @time 2019-03-17 09:37
  */
+@Data
+@Accessors(chain = true)
 public class OrderCreateItemDTO {
 
     /**

order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderDeliveryDTO.java

 package cn.iocoder.mall.order.api.dto;
 
+import lombok.Data;
+import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 import java.util.List;
 
@@ -9,6 +12,8 @@ import java.util.List;
  * @author Sin
  * @time 2019-03-30 22:31
  */
+@Data
+@Accessors(chain = true)
 public class OrderDeliveryDTO implements Serializable {
 
     /**

order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderItemDeletedDTO.java

 package cn.iocoder.mall.order.api.dto;
 
+import lombok.Data;
+import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 import java.util.List;
 
@@ -7,6 +10,8 @@ import java.util.List;
  * @author Sin
  * @time 2019-03-23 10:22
  */
+@Data
+@Accessors(chain = true)
 public class OrderItemDeletedDTO implements Serializable {
 
     /**

order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderItemUpdateDTO.java

 package cn.iocoder.mall.order.api.dto;
 
+import lombok.Data;
+import lombok.experimental.Accessors;
+
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
@@ -9,6 +12,8 @@ import java.io.Serializable;
  * @author Sin
  * @time 2019-03-16 14:46
  */
+@Data
+@Accessors(chain = true)
 public class OrderItemUpdateDTO implements Serializable {
 
     /**

order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderLogisticsUpdateDTO.java

 package cn.iocoder.mall.order.api.dto;
 
+import lombok.Data;
+import lombok.experimental.Accessors;
+
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
@@ -10,6 +13,8 @@ import java.io.Serializable;
  * @author Sin
  * @time 2019-03-17 20:22
  */
+@Data
+@Accessors(chain = true)
 public class OrderLogisticsUpdateDTO implements Serializable {
 
     /**

order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderQueryDTO.java

 package cn.iocoder.mall.order.api.dto;
 
+import lombok.Data;
+import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -9,6 +12,8 @@ import java.util.Date;
  * @author Sin
  * @time 2019-03-23 14:15
  */
+@Data
+@Accessors(chain = true)
 public class OrderQueryDTO implements Serializable {
 
     /**

order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderReturnCreateDTO.java

 package cn.iocoder.mall.order.api.dto;
 
+import lombok.Data;
+import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 
 /**
@@ -8,6 +11,8 @@ import java.io.Serializable;
  * @author Sin
  * @time 2019-03-30 15:34
  */
+@Data
+@Accessors(chain = true)
 public class OrderReturnCreateDTO implements Serializable {
 
     /**

promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/vo/users/UsersCouponCardVO.java

@@ -18,12 +18,16 @@ public class UsersCouponCardVO {
     private Integer id;
     @ApiModelProperty(value = "模板编号，自增唯一", required = true, example = "1")
     private Integer templateId;
+    @ApiModelProperty(value = "优惠劵名", required = true, example = "大保剑")
+    private String title;
     @ApiModelProperty(value = "优惠码状态", required = true, example = "参见 CouponCardStatusEnum 枚举")
     private Integer status;
 
     // ========== 基本信息 END ==========
 
     // ========== 使用规则 BEGIN ==========
+    @ApiModelProperty(value = "是否设置满多少金额可用，单位：分", required = true)
+    private Integer priceAvailable;
     @ApiModelProperty(value = "固定日期-生效开始时间", required = true)
     private Date validStartTime;
     @ApiModelProperty(value = "固定日期-生效结束时间", required = true)

promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/bo/CouponCardBO.java

@@ -21,6 +21,10 @@ public class CouponCardBO {
      * 优惠劵（码）分组编号
      */
     private Integer templateId;
+    /**
+     * 优惠劵名
+     */
+    private String title;
 //    /**
 //     * 核销码
 //     */
@@ -51,6 +55,10 @@ public class CouponCardBO {
     // ========== 领取情况 END ==========
 
     // ========== 使用规则 BEGIN ==========
+    /**
+     * 是否设置满多少金额可用，单位：分
+     */
+    private Integer priceAvailable;
     /**
      * 生效开始时间
      */

promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/constant/CouponTemplateStatusEnum.java

@@ -6,8 +6,8 @@ import java.util.Arrays;
 
 public enum CouponTemplateStatusEnum implements IntArrayValuable {
 
-    ENABLE(1, "开启中"),
-    DISABLE(2, "禁用中"),
+    ENABLE(1, "生效中"),
+    DISABLE(2, "已失效"),
 //    EXPIRE(3, "已过期"), TODO 芋艿，暂时不考虑过期的
     ;
 

promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/dataobject/CouponCardDO.java

@@ -22,6 +22,14 @@ public class CouponCardDO extends BaseDO {
      * 优惠劵（码）分组编号，{@link CouponTemplateDO} 的 id
      */
     private Integer templateId;
+    /**
+     * 优惠劵名
+     *
+     * 冗余自 {@link CouponTemplateDO} 的 title
+     *
+     * TODO 芋艿，暂时不考虑冗余的更新
+     */
+    private String title;
 //    /**
 //     * 核销码
 //     */
@@ -52,6 +60,10 @@ public class CouponCardDO extends BaseDO {
     // ========== 领取情况 END ==========
 
     // ========== 使用规则 BEGIN ==========
+    /**
+     * 是否设置满多少金额可用，单位：分
+     */
+    private Integer priceAvailable;
     /**
      * 生效开始时间
      */

promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/dataobject/CouponCodeDO.java

@@ -38,4 +38,6 @@ public class CouponCodeDO extends BaseDO {
      */
     private Integer couponId;
 
+    // TODO 芋艿，后续要考虑状态的追踪
+
 }

promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/dataobject/CouponTemplateDO.java

@@ -35,15 +35,6 @@ public class CouponTemplateDO extends BaseDO {
      * 2-优惠码
      */
     private Integer type;
-    /**
-     * 码类型
-     *
-     * 1-一卡一码（UNIQUE）
-     * 2-通用码（GENERAL）
-     *
-     * 【优惠码独有】 @see CouponCodeDO
-     */
-    private Integer codeType;
     /**
      * 优惠码状态
      *
@@ -212,4 +203,20 @@ public class CouponTemplateDO extends BaseDO {
 //    private Integer statUseNum;
     // ========== 统计信息 END ==========
 
+    // ========== 优惠码 BEGIN ==========
+    /**
+     * 码类型
+     *
+     * 1-一卡一码（UNIQUE）
+     * 2-通用码（GENERAL）
+     *
+     * 【优惠码独有】 @see CouponCodeDO
+     */
+    private Integer codeType;
+    /**
+     * 通用码
+     */
+    private String commonCode;
+    // ========== 优惠码 BEGIN ==========
+
 }

promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/scheduler/CouponCardExpireJob.java

+package cn.iocoder.mall.promotion.biz.scheduler;
+
+/**
+ * 优惠劵过期 Job
+ *
+ * TODO 芋艿
+ */
+public class CouponCardExpireJob {
+}

promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/service/CouponServiceImpl.java

@@ -224,10 +224,12 @@ public class CouponServiceImpl implements CouponService {
         // 1. 基本信息 + 领取情况
         CouponCardDO card = new CouponCardDO()
                 .setTemplateId(couponTemplateId)
+                .setTitle(template.getTitle())
                 .setStatus(CouponCardStatusEnum.UNUSED.getValue())
                 .setUserId(userId)
                 .setTakeType(CouponCardTakeTypeEnum.BY_USER.getValue()); // TODO 需要改
         // 2. 使用规则
+        card.setPriceAvailable(template.getPriceAvailable());
         setCouponCardValidTime(card, template);
         // 3. 使用效果
         card.setPreferentialType(template.getPreferentialType())

promotion/promotion-service-impl/src/main/resources/mapper/CouponCardMapper.xml

@@ -3,8 +3,8 @@
 <mapper namespace="cn.iocoder.mall.promotion.biz.dao.CouponCardMapper">
 
     <sql id="FIELDS">
-        id, template_id, status, user_id, take_type,
-        valid_start_time, valid_end_time, preferential_type, percent_off, price_off,
+        id, template_id, title, status, user_id, take_type,
+        price_available, valid_start_time, valid_end_time, preferential_type, percent_off, price_off,
         discount_price_limit, used_order_id,  used_price, used_time,
         create_time
     </sql>
@@ -78,13 +78,13 @@
 
     <insert id="insert" parameterType="CouponCardDO" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
         INSERT INTO coupon_card (
-          template_id, status, user_id, take_type,
-          valid_start_time, valid_end_time, preferential_type, percent_off, price_off,
+          template_id, title, status, user_id, take_type,
+          price_available, valid_start_time, valid_end_time, preferential_type, percent_off, price_off,
           discount_price_limit, used_order_id,  used_price, used_time,
           create_time
         ) VALUES (
-          #{templateId}, #{status}, #{userId}, #{takeType},
-          #{validStartTime}, #{validEndTime}, #{preferentialType}, #{percentOff}, #{priceOff},
+          #{templateId}, #{title}, #{status}, #{userId}, #{takeType},
+          #{priceAvailable}, #{validStartTime}, #{validEndTime}, #{preferentialType}, #{percentOff}, #{priceOff},
           #{discountPriceLimit}, #{usedOrderId}, #{usedPrice}, #{usedTime},
           #{createTime}
         )