diff --git a/mallinkAdmin/src/main/resources/db/migration/V2022060800001__mall_permission.sql b/mallinkAdmin/src/main/resources/db/migration/V2022060800001__mall_permission.sql new file mode 100644 index 000000000..7d33fb566 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V2022060800001__mall_permission.sql @@ -0,0 +1,4 @@ +INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (679, '抖音商品库', 606, 'Y', NULL, 1, NULL, NULL, 'dygoods', NULL, 0, 679); + + +UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 4, 5, 6, 50, 105, 110, 201, 205, 202, 211, 212, 221, 222, 223, 251, 409, 410, 411, 416, 500, 502, 504, 505, 506, 507, 508, 511, 512, 521, 522, 523, 531, 532, 591, 592, 595, 602, 605, 606, 607, 610, 647, 671, 679, 680, 711, 901, 902, 904, 907, 60702]' WHERE `id` = 11; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 98f627467..7cad3d40a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -57,7 +57,7 @@ import static java.util.stream.Collectors.toList; @Service -public class WxCouponServiceImpl implements WxCouponService { +public class WxCouponServiceImpl
implements WxCouponService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired @@ -680,6 +680,7 @@ public class WxCouponServiceImpl implements WxCouponService { } record.setSkuAttrs(JSONObject.toJSONString(skuAttrs)); }catch(Exception e){ + e.printStackTrace(); return new ResultData(ErrorCode.SYS_PARAMETER_CAST_ERROR); } WxCoupon coupon = new WxCoupon(); @@ -696,6 +697,12 @@ public class WxCouponServiceImpl implements WxCouponService { return new ResultData(record.getId()); } + public static void main(String[] args) { + String str = "[{\"desc\":\"\",\"isMulti\":false,\"isRequired\":true,\"isShow\":false,\"key\":\"appointment\",\"name\":\"预约信息\",\"valueDemo\":\"\",\"valueType\":\"APPOINTMENT\"},{\"desc\":\"\",\"isMulti\":false,\"isRequired\":true,\"isShow\":false,\"key\":\"auto_renew\",\"name\":\"是否开启自动延期\",\"valueDemo\":\"\",\"valueType\":\"BOOL\"},{\"desc\":\"\",\"isMulti\":false,\"isRequired\":true,\"isShow\":true,\"key\":\"bring_out_meal\",\"name\":\"是否可以外带餐食\",\"valueDemo\":\"\",\"valueType\":\"BOOL\",\"data\":\"false\"},{\"desc\":\"\",\"isMulti\":false,\"isRequired\":true,\"isShow\":false,\"key\":\"can_no_use_date\",\"name\":\"不可使用日期\",\"valueDemo\":\"\",\"valueType\":\"CAN_NO_USE_DATE\"},{\"desc\":\"\",\"isMulti\":false,\"isRequired\":false,\"isShow\":false,\"key\":\"customer_reserved_info\",\"name\":\"留资规则\",\"valueDemo\":\"\",\"valueType\":\"CUSTOMER_RESERVED_INFO\"},{\"desc\":\"\",\"isMulti\":true,\"isRequired\":false,\"isShow\":true,\"key\":\"description_rich_text\",\"name\":\"其他说明信息\",\"valueDemo\":\"\",\"valueType\":\"NOTE\",\"data\":\"\"},{\"desc\":\"\",\"isMulti\":true,\"isRequired\":false,\"isShow\":true,\"key\":\"detail_image_list\",\"name\":\"长图\",\"valueDemo\":\"\",\"valueType\":\"IMAGE\",\"data\":\"\"},{\"desc\":\"\",\"isMulti\":true,\"isRequired\":false,\"isShow\":true,\"key\":\"dishes_image_list\",\"name\":\"菜品图\",\"valueDemo\":\"\",\"valueType\":\"IMAGE\",\"data\":\"\"},{\"desc\":\"\",\"isMulti\":false,\"isRequired\":false,\"isShow\":false,\"key\":\"EntryType\",\"name\":\"入口类型\",\"valueDemo\":\"1:H5 2:小程序 3:抖音 4:lynx\",\"valueType\":\"INT64\"},{\"desc\":\"\",\"isMulti\":true,\"isRequired\":false,\"isShow\":true,\"key\":\"environment_image_list\",\"name\":\"环境图\",\"valueDemo\":\"\",\"valueType\":\"IMAGE\",\"data\":\"\"},{\"desc\":\"\",\"isMulti\":false,\"isRequired\":true,\"isShow\":true,\"key\":\"free_pack\",\"name\":\"是否可以打包\",\"valueDemo\":\"\",\"valueType\":\"BOOL\",\"data\":\"false\"},{\"desc\":\"\",\"isMulti\":true,\"isRequired\":false,\"isShow\":true,\"key\":\"FrontCategoryTag\",\"name\":\"前台品类标签\",\"valueDemo\":\"\",\"valueType\":\"STRING\",\"data\":\"[{\\\"value\\\":\\\"\\\"}]\"},{\"desc\":\"\",\"isMulti\":true,\"isRequired\":true,\"isShow\":false,\"key\":\"image_list\",\"name\":\"封面图\",\"valueDemo\":\"\",\"valueType\":\"IMAGE\"},{\"desc\":\"\",\"isMulti\":false,\"isRequired\":false,\"isShow\":false,\"key\":\"IndustryType\",\"name\":\"商品行业类型\",\"valueDemo\":\"\",\"valueType\":\"STRING\"},{\"desc\":\"\",\"isMulti\":false,\"isRequired\":false,\"isShow\":false,\"key\":\"IsConfirmImme\",\"name\":\"是否立即确认\",\"valueDemo\":\"\",\"valueType\":\"BOOL\"},{\"desc\":\"\",\"isMulti\":false,\"isRequired\":false,\"isShow\":false,\"key\":\"MpResourceID\",\"name\":\"小程序资源id\",\"valueDemo\":\"\",\"valueType\":\"STRING\"},{\"desc\":\"\",\"isMulti\":false,\"isRequired\":false,\"isShow\":false,\"key\":\"MpSettleType\",\"name\":\"小程序分账类型\",\"valueDemo\":\"1-包销 2-代销\",\"valueType\":\"INT64\"},{\"desc\":\"\",\"isMulti\":true,\"isRequired\":true,\"isShow\":true,\"key\":\"Notification\",\"name\":\"使用规则\",\"valueDemo\":\"\",\"valueType\":\"NOTIFICATION\",\"data\":\"[{\\\"value\\\":\\\"\\\",\\\"content\\\":\\\"1\\\",\\\"title\\\":\\\"2\\\"}]\"},{\"desc\":\"\",\"isMulti\":false,\"isRequired\":true,\"isShow\":true,\"key\":\"private_room\",\"name\":\"是否可以使用包间\",\"valueDemo\":\"\",\"valueType\":\"BOOL\",\"data\":\"false\"},{\"desc\":\"\",\"isMulti\":false,\"isRequired\":false,\"isShow\":false,\"key\":\"real_name_info\",\"name\":\"实名信息\",\"valueDemo\":\"\",\"valueType\":\"REAL_NAME_INFO\"},{\"desc\":\"\",\"isMulti\":false,\"isRequired\":false,\"isShow\":true,\"key\":\"RecommendWord\",\"name\":\"推荐语\",\"valueDemo\":\"\",\"valueType\":\"STRING\",\"data\":\"\"},{\"desc\":\"\",\"isMulti\":false,\"isRequired\":true,\"isShow\":true,\"key\":\"rec_person_num\",\"name\":\"建议使用人数\",\"valueDemo\":\"\",\"valueType\":\"INT64\",\"data\":\"1\"},{\"desc\":\"\",\"isMulti\":false,\"isRequired\":true,\"isShow\":true,\"key\":\"rec_person_num_max\",\"name\":\"最多使用人数\",\"valueDemo\":\"\",\"valueType\":\"INT64\",\"data\":\"22\"},{\"desc\":\"\",\"isMulti\":false,\"isRequired\":true,\"isShow\":false,\"key\":\"RefundPolicy\",\"name\":\"退款政策\",\"valueDemo\":\"1-允许退款 2-不可退款 3-有条件退\",\"valueType\":\"INT64\"},{\"desc\":\"\",\"isMulti\":false,\"isRequired\":true,\"isShow\":false,\"key\":\"refund_need_merchant_confirm\",\"name\":\"退款是否需商家审核\",\"valueDemo\":\"\",\"valueType\":\"BOOL\"},{\"desc\":\"\",\"isMulti\":false,\"isRequired\":true,\"isShow\":true,\"key\":\"show_channel\",\"name\":\"投放渠道\",\"valueDemo\":\"1-不限制 2-仅直播间可见\",\"valueType\":\"INT64\",\"data\":\"1\"},{\"desc\":\"\",\"isMulti\":false,\"isRequired\":false,\"isShow\":false,\"key\":\"SortWeight\",\"name\":\"排序权重\",\"valueDemo\":\"\",\"valueType\":\"INT64\"},{\"desc\":\"\",\"isMulti\":false,\"isRequired\":true,\"isShow\":true,\"key\":\"superimposed_discounts\",\"name\":\"可以享受店内其他优惠\",\"valueDemo\":\"\",\"valueType\":\"BOOL\",\"data\":\"false\"},{\"desc\":\"\",\"isMulti\":false,\"isRequired\":false,\"isShow\":false,\"key\":\"TagList\",\"name\":\"标签列表\",\"valueDemo\":\"\",\"valueType\":\"STRING\"},{\"desc\":\"\",\"isMulti\":false,\"isRequired\":false,\"isShow\":true,\"key\":\"trade_url\",\"name\":\"小程序提单页跳转\",\"valueDemo\":\"\",\"valueType\":\"STRING\",\"data\":\"\"},{\"desc\":\"\",\"isMulti\":false,\"isRequired\":true,\"isShow\":false,\"key\":\"use_date\",\"name\":\"使用日期\",\"valueDemo\":\"\",\"valueType\":\"USE_DATE\"},{\"desc\":\"\",\"isMulti\":false,\"isRequired\":true,\"isShow\":false,\"key\":\"use_time\",\"name\":\"使用时间\",\"valueDemo\":\"\",\"valueType\":\"USE_TIME\"}]"; + List productAttrs = JSONObject.parseArray(str, GoodsTemplateGet.ProductAttrs.class); + System.out.println(productAttrs); + } + /** * 清除c端首页券列表缓存