| @@ -1,9 +1,10 @@ | |||||
| --加可配送商品 | --加可配送商品 | ||||
| INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (665, '可配送商品', 604, 'Y', NULL, 1, NULL, NULL, 'distributableCoupon', null, 0, 665); | INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (665, '可配送商品', 604, 'Y', NULL, 1, NULL, NULL, 'distributableCoupon', null, 0, 665); | ||||
| INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (666, '券礼包', 604, 'Y', NULL, 1, NULL, NULL, 'couponGiftList', null, 0, 666); | |||||
| --加商品订单 | --加商品订单 | ||||
| INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (714, '商品订单', 610, 'Y', NULL, 1, NULL, NULL, 'distributableOrder', NULL, 0, 714); | INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (714, '商品订单', 610, 'Y', NULL, 1, NULL, NULL, 'distributableOrder', NULL, 0, 714); | ||||
| --UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 201, 202, 203, 204, 205, 206, 209, 211, 212, 221, 222, 251, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 501, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 614, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 661, 662, 663, 664, 665, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 686, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 714, 901, 902, 903, 904, 905, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 60701, 60702]' WHERE `id` = 1; | |||||
| --UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 201, 202, 203, 204, 205, 206, 209, 211, 212, 221, 222, 251, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 501, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 614, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 686, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 714, 901, 902, 903, 904, 905, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 60701, 60702]' WHERE `id` = 1; | |||||
| UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 201, 202, 203, 204, 205, 206, 209, 211, 212, 221, 222, 251, 299, 300, 301, 302, 303, 304, 305, 306, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 501, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 614, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 661, 662, 663, 664, 665, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 686, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 714, 901, 902, 903, 904, 905, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 60701, 60702]' WHERE `id` = 1; | |||||
| UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 201, 202, 203, 204, 205, 206, 209, 211, 212, 221, 222, 251, 299, 300, 301, 302, 303, 304, 305, 306, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 501, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 614, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 686, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 714, 901, 902, 903, 904, 905, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 60701, 60702]' WHERE `id` = 1; | |||||
| @@ -43,6 +43,10 @@ public class WxCoupon extends TenantEntity { | |||||
| @SortColumn(column = "use_price") | @SortColumn(column = "use_price") | ||||
| private String usePriceStr; | private String usePriceStr; | ||||
| @TableField(exist = false) | |||||
| @SortColumn(column = "freight_price") | |||||
| private String freightPriceStr; | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| @SortColumn(column = "price") | @SortColumn(column = "price") | ||||
| private String priceStr; | private String priceStr; | ||||
| @@ -67,7 +71,7 @@ public class WxCoupon extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="查询-结束时间",name="enddate") | @io.swagger.annotations.ApiModelProperty(value="查询-结束时间",name="enddate") | ||||
| private Date enddate; | private Date enddate; | ||||
| @io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,50.积分券,51.积分停车券,100.消费卡)",name="type") | |||||
| @io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,10.预购商品,11.可配送商品,12.券礼包,50.积分券,51.积分停车券,100.消费卡)",name="type") | |||||
| private Integer type; | private Integer type; | ||||
| @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") | @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") | ||||
| private String coverImg; | private String coverImg; | ||||
| @@ -86,6 +90,8 @@ public class WxCoupon extends TenantEntity { | |||||
| private Integer salePrice; | private Integer salePrice; | ||||
| @io.swagger.annotations.ApiModelProperty(value="使用条件金额(适用于类型1,2,3,4)",name="usePrice") | @io.swagger.annotations.ApiModelProperty(value="使用条件金额(适用于类型1,2,3,4)",name="usePrice") | ||||
| private Integer usePrice; | private Integer usePrice; | ||||
| @io.swagger.annotations.ApiModelProperty(value="运费",name="freightPrice") | |||||
| private Integer freightPrice; | |||||
| //EnumCouponUseLimitRule | //EnumCouponUseLimitRule | ||||
| @io.swagger.annotations.ApiModelProperty(value="限领规则",name="useLimitRule") | @io.swagger.annotations.ApiModelProperty(value="限领规则",name="useLimitRule") | ||||
| private Integer useLimitRule; | private Integer useLimitRule; | ||||
| @@ -213,6 +219,10 @@ public class WxCoupon extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="富文本内容",name="html") | @io.swagger.annotations.ApiModelProperty(value="富文本内容",name="html") | ||||
| private String html; | private String html; | ||||
| //List<Long> String | |||||
| @io.swagger.annotations.ApiModelProperty(value="卷包内容",name="giftList") | |||||
| private String giftList; | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| @SortColumn(column = "press_count") | @SortColumn(column = "press_count") | ||||
| private Integer pressSendCount; | private Integer pressSendCount; | ||||
| @@ -279,6 +289,13 @@ public class WxCoupon extends TenantEntity { | |||||
| return usePriceStr; | return usePriceStr; | ||||
| } | } | ||||
| public String getFreightPriceStr() { | |||||
| if(freightPrice!=null) { | |||||
| freightPriceStr = new BigDecimal(freightPrice).divide(new BigDecimal(100)).toString(); | |||||
| } | |||||
| return freightPriceStr; | |||||
| } | |||||
| public String getPriceStr() { | public String getPriceStr() { | ||||
| if(price!=null) { | if(price!=null) { | ||||
| priceStr = new BigDecimal(price).divide(new BigDecimal(100)).toString(); | priceStr = new BigDecimal(price).divide(new BigDecimal(100)).toString(); | ||||
| @@ -1,13 +1,16 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import cn.afterturn.easypoi.excel.annotation.Excel; | |||||
| import com.baomidou.mybatisplus.annotation.TableField; | import com.baomidou.mybatisplus.annotation.TableField; | ||||
| import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||
| import com.fasterxml.jackson.annotation.JsonFormat; | import com.fasterxml.jackson.annotation.JsonFormat; | ||||
| import com.iformall.common.SortColumn; | |||||
| import com.iformall.domain.po.base.TenantEntity; | import com.iformall.domain.po.base.TenantEntity; | ||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| import lombok.ToString; | import lombok.ToString; | ||||
| import java.math.BigDecimal; | |||||
| import java.text.DecimalFormat; | import java.text.DecimalFormat; | ||||
| import java.util.Date; | import java.util.Date; | ||||
| @@ -21,7 +24,7 @@ public class WxCouponOrder extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "卡券ID", name = "couponId") | @io.swagger.annotations.ApiModelProperty(value = "卡券ID", name = "couponId") | ||||
| private Long couponId; | private Long couponId; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,100.消费卡)", name = "couponType") | |||||
| @io.swagger.annotations.ApiModelProperty(value = "券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,10.预购商品,11.可配送商品,12.券礼包,50.积分券,51.积分停车券,100.消费卡)", name = "couponType") | |||||
| private Integer couponType; | private Integer couponType; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "c端用户id", name = "cUserId") | @io.swagger.annotations.ApiModelProperty(value = "c端用户id", name = "cUserId") | ||||
| private Long cUserId; | private Long cUserId; | ||||
| @@ -124,4 +127,28 @@ public class WxCouponOrder extends TenantEntity { | |||||
| this.cUserId = cUserId; | this.cUserId = cUserId; | ||||
| } | } | ||||
| @io.swagger.annotations.ApiModelProperty(value="运费",name="freightPrice") | |||||
| private Integer freightPrice; | |||||
| @TableField(exist = false) | |||||
| @SortColumn(column = "freight_price") | |||||
| private String freightPriceStr; | |||||
| public String getFreightPriceStr() { | |||||
| if(freightPrice!=null) { | |||||
| freightPriceStr = new BigDecimal(freightPrice).divide(new BigDecimal(100)).toString(); | |||||
| } | |||||
| return freightPriceStr; | |||||
| } | |||||
| @io.swagger.annotations.ApiModelProperty(value="收货地址",name="shippingAddress") | |||||
| private String shippingAddress; | |||||
| @io.swagger.annotations.ApiModelProperty(value="配送类型 0:默认(无) 1:自提 2:配送",name="shippingType") | |||||
| private Integer shippingType; | |||||
| @io.swagger.annotations.ApiModelProperty(value="配送信息",name="deliveryInfo") | |||||
| private String deliveryInfo; | |||||
| } | } | ||||
| @@ -3,6 +3,7 @@ package com.iformall.domain.po; | |||||
| import cn.afterturn.easypoi.excel.annotation.Excel; | import cn.afterturn.easypoi.excel.annotation.Excel; | ||||
| import com.baomidou.mybatisplus.annotation.TableField; | import com.baomidou.mybatisplus.annotation.TableField; | ||||
| import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||
| import com.iformall.common.SortColumn; | |||||
| import com.iformall.domain.po.base.TenantEntity; | import com.iformall.domain.po.base.TenantEntity; | ||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| @@ -102,6 +103,8 @@ public class WxOrder extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="组合订单类型EnumComposeOrder",name="composeOrderType") | @io.swagger.annotations.ApiModelProperty(value="组合订单类型EnumComposeOrder",name="composeOrderType") | ||||
| private Integer composeOrderType; | private Integer composeOrderType; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| protected List<Integer> statusS; | protected List<Integer> statusS; | ||||
| @@ -113,7 +116,7 @@ public class WxOrder extends TenantEntity { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private String title; | private String title; | ||||
| @Excel(name = "商品属性", width = 20, orderNum = "4", replace = {"消费卡_1", "优惠券_2", "砍价_3", "拼团_4", " _-1"}) | |||||
| @Excel(name = "商品属性", width = 20, orderNum = "4", replace = {"消费卡_1", "优惠券_2", "砍价_3", "拼团_4","可配送商品_5", " _-1"}) | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private Integer attribute; | private Integer attribute; | ||||
| @@ -136,4 +139,24 @@ public class WxOrder extends TenantEntity { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private String paymentStr; | private String paymentStr; | ||||
| @io.swagger.annotations.ApiModelProperty(value="运费",name="freightPrice") | |||||
| private Integer freightPrice; | |||||
| @TableField(exist = false) | |||||
| @SortColumn(column = "freight_price") | |||||
| private String freightPriceStr; | |||||
| public String getFreightPriceStr() { | |||||
| if(freightPrice!=null) { | |||||
| freightPriceStr = new BigDecimal(freightPrice).divide(new BigDecimal(100)).toString(); | |||||
| } | |||||
| return freightPriceStr; | |||||
| } | |||||
| @io.swagger.annotations.ApiModelProperty(value="收货地址",name="shippingAddress") | |||||
| private String shippingAddress; | |||||
| @io.swagger.annotations.ApiModelProperty(value="配送类型 0:默认(无) 1:自提 2:配送",name="shippingType") | |||||
| private Integer shippingType; | |||||
| } | } | ||||
| @@ -7,7 +7,8 @@ public enum EnumCouponSendType { | |||||
| // 1:主动领取 2:定向投放 | // 1:主动领取 2:定向投放 | ||||
| ACTIVE(1,"主动领取"), | ACTIVE(1,"主动领取"), | ||||
| PASSIVE(2, "定向投放") | |||||
| PASSIVE(2, "定向投放"), | |||||
| GIFT(3, "礼包券") | |||||
| ; | ; | ||||
| public static EnumCouponSendType getEnum(Integer code) { | public static EnumCouponSendType getEnum(Integer code) { | ||||
| @@ -17,6 +17,7 @@ public enum EnumCouponType { | |||||
| COUPON_GROUP(9, "团购券"), | COUPON_GROUP(9, "团购券"), | ||||
| COUPON_PREORDER(10, "预购商品"), | COUPON_PREORDER(10, "预购商品"), | ||||
| COUPON_DISTRIBUTION(11, "可配送商品"), | COUPON_DISTRIBUTION(11, "可配送商品"), | ||||
| COUPON_GIFT(12, "券礼包"), | |||||
| COUPON_CREDIT(50,"积分券"), | COUPON_CREDIT(50,"积分券"), | ||||
| COUPON_CREDIT_PARK(51,"积分停车券"), | COUPON_CREDIT_PARK(51,"积分停车券"), | ||||
| CARD_MULTIMCH(100, "消费卡"), | CARD_MULTIMCH(100, "消费卡"), | ||||