1111

docs/databases/table_create.sql

@@ -83,6 +83,8 @@ CREATE TABLE `lpk_card_build_record` (
 	`countNumber` int(11) DEFAULT 1 COMMENT '本次创建卡的张数',	
 	`startNumber` VARCHAR(100) NULL DEFAULT NULL COMMENT '起始号',
 	`endNumber` VARCHAR(100) NULL DEFAULT NULL COMMENT '终止号',
+	`cardArea` VARCHAR(100) NULL DEFAULT NULL COMMENT '区域号，2位纯数字',
+	`currentNumber` BIGINT(32) DEFAULT 1 COMMENT '当前本区域编号',	
 		    
 	PRIMARY KEY (`id`) USING BTREE
 ) ENGINE=InnoDB  COMMENT='礼包卡创建记录';
@@ -95,7 +97,8 @@ CREATE TABLE `lpk_giftcard` (
 	`remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
 	`isEnable` int(11) DEFAULT 1 COMMENT '是否可用',
 	
-	`recordSid` VARCHAR(100) NULL DEFAULT NULL COMMENT '礼包卡创建记录id',	
+	`recordId` BIGINT(32) NULL DEFAULT NULL COMMENT '礼包卡创建记录id',	
+	`recordSid` VARCHAR(100) NULL DEFAULT NULL COMMENT '礼包卡创建记录Sid',	
 	`giftbagSid` VARCHAR(100) NULL DEFAULT NULL COMMENT '礼包Sid',	
 	
 	`serialNumber` VARCHAR(100) NULL DEFAULT NULL COMMENT '序列号(长8位的数字串)',
@@ -160,6 +163,7 @@ CREATE TABLE `lpk_reserve_order_goods` (
 	`createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
 	`remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
 	
+	`orderSid` VARCHAR(100) NULL DEFAULT NULL COMMENT '订单SID',
 	`cardSid` VARCHAR(100) NULL DEFAULT NULL COMMENT '礼品卡SID',
 	
 	`goodsSid` VARCHAR(100) NULL DEFAULT NULL COMMENT '商品Sid',	
@@ -169,3 +173,7 @@ CREATE TABLE `lpk_reserve_order_goods` (
 ) ENGINE=InnoDB  COMMENT='预约订单商品';
 
 
+-- 重置预约-订单数据
+delete * from lpk_customer
+delete * from lpk_reserve_order
+delete * from lpk_reserve_order_goods

docs/tester/p7Ia3v5Hrt.txt

@@ -0,0 +1 @@
+07c4ff45cfef408144a511604debc315

src/main/java/com/yxt/yyth/biz/lpkcustomer/LpkCustomerService.java

@@ -35,8 +35,11 @@ public class LpkCustomerService extends MybatisBaseService<LpkCustomerMapper, Lp
 //    String APP_ID = "wx4724e3a3c27f36b5";
 //    String SECRET = "971fd3b8aa7b08ce3e8a5f3e502b1a8d";
 //  汇融云眼
-    String APP_ID = "wx11565021714ba796";
+//    String APP_ID = "wx11565021714ba796";
-    String SECRET = "eb511fbb5f864cdabc3d044b639814c9";
+//    String SECRET = "eb511fbb5f864cdabc3d044b639814c9";
+//  汇融惠家
+    String APP_ID = "wx97c0a62c6d65207f";
+    String SECRET = "e4572da4407573213377cd00e422397d";
     private static final String WX_URL_LOGIN = "https://api.weixin.qq.com/sns/jscode2session?appid=APPID&secret=SECRET&js_code=JSCODE&grant_type=authorization_code ";
 
     public ResultBean<JSONObject> wxLogin(String jsCode, String appid, String secret) {

src/main/resources/application.yml

@@ -2,9 +2,9 @@ spring:
   application:
     name: yxt-lpk-yyth
   profiles:
-    active: devv
+#    active: devv
 #    active: test
-#    active: pro
+    active: pro
   messages:
     # 国际化资源文件路径
     basename: i18n/messages