Merge remote-tracking branch 'origin/master'

1 year ago · d4a639ddc5
10 changed files with 69103 additions and 14 deletions
--- a/docs/databases/table_create-vege.sql
+++ b/docs/databases/table_create-vege.sql
@ -0,0 +1,30 @@
+
+DROP TABLE IF EXISTS `vege_replenish`;
+CREATE TABLE `vege_replenish` (
+	`id` BIGINT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号',
+	`sid` VARCHAR(64) NOT NULL COMMENT 'sid',
+	`createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+	`remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
+	
+	`cardCode` VARCHAR(255) NULL DEFAULT NULL COMMENT '卡编码，个人卡、企业卡是卡编码，转赠记录的是转赠编码',
+	`customerSid` VARCHAR(100) NULL DEFAULT NULL COMMENT '绑卡人',
+	`cardtype` VARCHAR(255) NULL DEFAULT 0 COMMENT '0 个人卡  1 企业卡 2 转赠的',
+		
+	PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB  COMMENT='绑卡记录';
+
+DROP TABLE IF EXISTS `vege_replenish_detail`;
+CREATE TABLE `vege_replenish_detail` (
+	`id` BIGINT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号',
+	`sid` VARCHAR(64) NOT NULL COMMENT 'sid',
+	`createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+	`remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
+
+	`orderSid` VARCHAR(100) NULL DEFAULT NULL COMMENT '订单SID',
+	`goodsSid` VARCHAR(100) NULL DEFAULT NULL COMMENT '商品Sid',
+	`goodsName` VARCHAR(100) NULL DEFAULT NULL COMMENT '商品名称',	
+	`goodsNumber` INT(10) NULL DEFAULT '1' COMMENT '商品数量',
+	
+	PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB  COMMENT='绑卡记录商品信息';
+
--- a/docs/databases/yxt_lpk_yythmall-pms-20240120150330.sql
+++ b/docs/databases/yxt_lpk_yythmall-pms-20240120150330.sql
--- a/docs/databases/将卡中数据导入到账户中.sql
+++ b/docs/databases/将卡中数据导入到账户中.sql
@ -0,0 +1,371 @@
+
+
+
+
+
+
+
+-- 个人卡
+CREATE TABLE tmp_cust_goods(
+	SELECT 
+		r.wxMpOpenid,
+		d.customerSid,
+		d.bindDate,
+		d.giftbagSid,
+		d.serialNumber,
+		d.code,
+		s.goodsSid,
+		s.goodsNumber,
+		e.NAME AS goodsName,
+		'个人卡' cardtype
+	FROM lpk_giftcard d 
+		LEFT JOIN lpk_customer r ON r.sid = d.customerSid	
+		LEFT JOIN lpk_giftbag_goods s ON s.giftbagSid=d.giftbagSid 	
+		LEFT JOIN lpk_goods e ON e.sid = s.goodsSid  	
+	WHERE d.customerSid IS NOT NULL AND d.customerSid <> '' 
+	ORDER BY r.wxMpOpenid
+);
+
+-- 企业卡
+INSERT INTO tmp_cust_goods 
+	SELECT 
+		r.wxMpOpenid,
+		d.customerSid,
+		d.bindDate,
+		d.giftbagSid,
+		d.serialNumber,
+		d.code,
+		s.goodsSid,
+		s.goodsNumber,
+		e.NAME AS goodsName,
+		'企业卡' cardtype
+	FROM emp_card d 
+		LEFT JOIN lpk_customer r ON r.sid = d.customerSid	
+		LEFT JOIN lpk_giftbag_goods s ON s.giftbagSid=d.giftbagSid 	
+		LEFT JOIN lpk_goods e ON e.sid = s.goodsSid  	
+	WHERE d.customerSid IS NOT NULL AND d.customerSid <> '' 
+	ORDER BY r.wxMpOpenid;
+
+-- 购买卡
+INSERT INTO tmp_cust_goods 
+	SELECT 
+		r.wxMpOpenid,
+		d.customerSid,
+		d.bindDate,
+		d.sid,
+		d.serialNumber,
+		d.code,
+		s.goodsSid,
+		s.goodsNumber,
+		e.NAME AS goodsName,
+		'购买卡' cardtype
+	FROM emp_card_gift d 
+		LEFT JOIN lpk_customer r ON r.sid = d.customerSid	
+		LEFT JOIN emp_card_gift_goods s ON s.empCardGiftSid=d.sid 	
+		LEFT JOIN lpk_goods e ON e.sid = s.goodsSid  	
+	WHERE d.customerSid IS NOT NULL AND d.customerSid <> '' AND d.isSenior = '1' 
+	ORDER BY r.wxMpOpenid;
+
+-- 转赠卡
+INSERT INTO tmp_cust_goods 
+	SELECT 
+		r.wxMpOpenid,
+		d.customerSid,
+		d.bindDate,
+		d.sid,
+		d.serialNumber,
+		d.code,
+		s.goodsSid,
+		s.goodsNumber,
+		e.NAME AS goodsName,
+		'转赠卡' cardtype
+	FROM emp_card_gift d 
+		LEFT JOIN lpk_customer r ON r.sid = d.customerSid	
+		LEFT JOIN emp_card_gift_goods s ON s.empCardGiftSid=d.sid 	
+		LEFT JOIN lpk_goods e ON e.sid = s.goodsSid  	
+	WHERE d.customerSid IS NOT NULL AND d.customerSid <> '' AND d.isSenior = '2' 
+	ORDER BY r.wxMpOpenid;
+	
+	
+	-- 预约提货，数量为负值
+	INSERT INTO tmp_cust_goods 
+		SELECT 
+			r.wxMpOpenid,
+			d.customerSid,
+			d.reserveDate,
+			d.sid,
+			d.storeSid,
+			d.cardCode,
+			s.goodsSid,
+			-s.goodsNumber AS goodsNumber,
+			e.NAME AS goodsName,
+			d.cardType cardtype
+		FROM lpk_reserve_order d 
+			LEFT JOIN lpk_customer r ON r.sid = d.customerSid	
+			LEFT JOIN lpk_reserve_order_goods s ON s.orderSid=d.sid 	
+			LEFT JOIN lpk_goods e ON e.sid = s.goodsSid  	
+		WHERE 1=1
+		ORDER BY r.wxMpOpenid;
+	
+	
+	-- 赠出的卡，数量为负值
+	INSERT INTO tmp_cust_goods 
+	SELECT 
+		r.wxMpOpenid,
+		d.empCardCustomerSid,
+		d.grantDate,
+		d.sid,
+		d.serialNumber,
+		d.code,
+		s.goodsSid,
+		-s.goodsNumber AS goodsNumber,
+		e.NAME AS goodsName,
+		'赠出' cardtype
+	FROM emp_card_gift d 
+		LEFT JOIN lpk_customer r ON r.sid = d.empCardCustomerSid	
+		LEFT JOIN emp_card_gift_goods s ON s.empCardGiftSid=d.sid 	
+		LEFT JOIN lpk_goods e ON e.sid = s.goodsSid  	
+	WHERE d.empCardCustomerSid IS NOT NULL AND d.empCardCustomerSid <> '' AND d.isSenior = '2' 
+	ORDER BY r.wxMpOpenid;
+
+select * from tmp_cust_goods;
+
+-- 统计
+	INSERT INTO vegetable_cellar(sid,customerSid,goodsSid,goodsNumber)
+	SELECT 
+	   UUID(),
+		customerSid,
+		goodsSid,
+		SUM(goodsNumber) AS goodsNumber
+	FROM tmp_cust_goods
+	GROUP BY customerSid,goodsSid
+	HAVING goodsNumber>0 
+	
+
+
+	update vegetable_cellar vc set affiliation=(select brandId from lpk_goods lg where vc.goodsSid=lg.sid) where 1=1
+
+
+	
+聂金义:
+默认名称为“惠享客户000142”
+
+聂金义:
+把“小主”换成“惠享客户”
+SELECT * FROM lpk_customer WHERE nick LIKE '小主%'
+
+SELECT * FROM lpk_customer WHERE nick IS NOT NULL 
+
+UPDATE lpk_customer set nick=REPLACE(nick,'小主','惠享客户') WHERE nick LIKE '小主%'
+	
+	SELECT * FROM lpk_goods WHERE sid='ac146c0f-9002-4203-8f59-ff7c46d3159c'
+	
+	
+		SELECT * FROM lpk_goods WHERE sid IN (
+	SELECT goodsSid FROM vegetable_cellar WHERE affiliation IS NULL GROUP BY goodsSid
+	)
+
+
+	
+	SELECT * FROM lpk_giftcard WHERE serialNumber='00000010'
+	
+	
+	SELECT * FROM lpk_customer WHERE sid='e0f2b745-8055-48bc-a506-ff09dd82ddb5'
+	
+	
+	SELECT * FROM lpk_giftbag WHERE sid='8e667618-63de-480c-ad1e-2747b76aa99b'
+	
+	
+	SELECT * FROM lpk_giftbag_goods  lgg 
+	LEFT join lpk_goods lg on lg.sid=lgg.goodsSid	
+	WHERE lgg.giftbagSid='8e667618-63de-480c-ad1e-2747b76aa99b'
+	
+	
+	
+	SELECT * FROM lpk_giftcard WHERE serialNumber in(
+	'00000001',
+	'00000002',
+	'00000003',
+	'00000004',
+	'00000005',
+	'00000006',
+	'00000007',
+	'00000008',
+	'00000009',
+	'00000010',
+	'00000011',
+	'00000012',
+	'00000013',
+	'00000014',
+	'00000015',
+	'00000016',
+	'00000017',
+	'00000018',
+	'00000019',
+	'00000020'
+	)
+	
+
+	
+	SELECT 
+	r.wxMpOpenid,
+	serialNumber,customerSid,giftbagSid 
+	FROM lpk_giftcard  lg 
+	LEFT JOIN lpk_customer r ON r.sid = lg.customerSid	
+	WHERE serialNumber in(
+	'00000001',
+	'00000002',
+	'00000003',
+	'00000004',
+	'00000005',
+	'00000006',
+	'00000007',
+	'00000008',
+	'00000009',
+	'00000010',
+	'00000011',
+	'00000012',
+	'00000013',
+	'00000014',
+	'00000015',
+	'00000016',
+	'00000017',
+	'00000018',
+	'00000019',
+	'00000020'
+	)
+"wxMpOpenid"	"serialNumber"	"customerSid"	"giftbagSid"
+"o81zC6xQKV_Rau7cntsaUwOkf9NM"	"00000013"	"c89f8631-e401-4010-a223-0caf3fabd5c6"	"8e667618-63de-480c-ad1e-2747b76aa99b"
+"o81zC6xQKV_Rau7cntsaUwOkf9NM"	"00000015"	"c89f8631-e401-4010-a223-0caf3fabd5c6"	"8e667618-63de-480c-ad1e-2747b76aa99b"
+"o81zC65z6tNd5L6ximemKJKBc-4w"	"00000010"	"e0f2b745-8055-48bc-a506-ff09dd82ddb5"	"8e667618-63de-480c-ad1e-2747b76aa99b"
+"o81zC610j5hKap2qQL_IxskermLY"	"00000006"	"a43573f1-e94f-455c-ad5d-3979bf56864e"	"8e667618-63de-480c-ad1e-2747b76aa99b"
+"o81zC610j5hKap2qQL_IxskermLY"	"00000008"	"a43573f1-e94f-455c-ad5d-3979bf56864e"	"8e667618-63de-480c-ad1e-2747b76aa99b"
+"o81zC6xZjXUAHJqbEkeHtec2vPPo"	"00000001"	"e157745c-856a-472d-a81e-2975312bf171"	"8e667618-63de-480c-ad1e-2747b76aa99b"
+"o81zC60V3ymrfjgK-BifvcyWfJBo"	"00000014"	"05ba58d6-f1f0-4f68-9bcc-62ceeaf4c088"	"8e667618-63de-480c-ad1e-2747b76aa99b"
+"o81zC6xfASEwu63AUvjeeJ6_t4oU"	"00000002"	"e569243c-1830-4316-8b4e-d4568b5a151d"	"8e667618-63de-480c-ad1e-2747b76aa99b"
+\N	"00000003"	""	"8e667618-63de-480c-ad1e-2747b76aa99b"
+\N	"00000004"	""	"8e667618-63de-480c-ad1e-2747b76aa99b"
+\N	"00000005"	""	"8e667618-63de-480c-ad1e-2747b76aa99b"
+\N	"00000007"	""	"8e667618-63de-480c-ad1e-2747b76aa99b"
+\N	"00000009"	""	"8e667618-63de-480c-ad1e-2747b76aa99b"
+\N	"00000011"	""	"8e667618-63de-480c-ad1e-2747b76aa99b"
+\N	"00000012"	""	"8e667618-63de-480c-ad1e-2747b76aa99b"
+
+
+
+"serialNumber"	"customerSid"	"giftbagSid"
+"00000001"	"e157745c-856a-472d-a81e-2975312bf171"	"8e667618-63de-480c-ad1e-2747b76aa99b"
+"00000002"	"e569243c-1830-4316-8b4e-d4568b5a151d"	"8e667618-63de-480c-ad1e-2747b76aa99b"
+"00000006"	"a43573f1-e94f-455c-ad5d-3979bf56864e"	"8e667618-63de-480c-ad1e-2747b76aa99b"
+"00000008"	"a43573f1-e94f-455c-ad5d-3979bf56864e"	"8e667618-63de-480c-ad1e-2747b76aa99b"
+"00000010"	"e0f2b745-8055-48bc-a506-ff09dd82ddb5"	"8e667618-63de-480c-ad1e-2747b76aa99b"
+"00000013"	"c89f8631-e401-4010-a223-0caf3fabd5c6"	"8e667618-63de-480c-ad1e-2747b76aa99b"
+"00000014"	"05ba58d6-f1f0-4f68-9bcc-62ceeaf4c088"	"8e667618-63de-480c-ad1e-2747b76aa99b"
+"00000015"	"c89f8631-e401-4010-a223-0caf3fabd5c6"	"8e667618-63de-480c-ad1e-2747b76aa99b"
+
+SELECT COUNT(1) FROM vegetable_cellar; -- 970
+
+select * from vegetable_cellar where customerSid='a43573f1-e94f-455c-ad5d-3979bf56864e'; -- 14
+
+delete FROM vegetable_cellar where customerSid='a43573f1-e94f-455c-ad5d-3979bf56864e';
+
+SELECT * FROM tmp_cust_goods WHERE customerSid='a43573f1-e94f-455c-ad5d-3979bf56864e';
+
+
+	INSERT INTO vegetable_cellar(sid,customerSid,goodsSid,goodsNumber)
+	SELECT 
+	   UUID(),
+		customerSid,
+		goodsSid,
+		SUM(goodsNumber) AS goodsNumber
+	FROM tmp_cust_goods
+	where customerSid='a43573f1-e94f-455c-ad5d-3979bf56864e' and serialNumber not in ('00000006','00000008') 
+	GROUP BY customerSid,goodsSid
+	HAVING goodsNumber>0 
+	
+
+SELECT COUNT(1) FROM vegetable_cellar; -- 970
+
+select * from vegetable_cellar where customerSid='c89f8631-e401-4010-a223-0caf3fabd5c6'; -- 17
+
+delete FROM vegetable_cellar where customerSid='c89f8631-e401-4010-a223-0caf3fabd5c6';
+
+SELECT * FROM tmp_cust_goods WHERE customerSid='c89f8631-e401-4010-a223-0caf3fabd5c6';
+
+
+	INSERT INTO vegetable_cellar(sid,customerSid,goodsSid,goodsNumber)
+	SELECT 
+	   UUID(),
+		customerSid,
+		goodsSid,
+		SUM(goodsNumber) AS goodsNumber
+	FROM tmp_cust_goods
+	where customerSid='c89f8631-e401-4010-a223-0caf3fabd5c6' and serialNumber not in ('00000013','00000015') 
+	GROUP BY customerSid,goodsSid
+	HAVING goodsNumber>0 
+
+
+SELECT COUNT(1) FROM vegetable_cellar; -- 958
+
+
+select * from vegetable_cellar where customerSid='05ba58d6-f1f0-4f68-9bcc-62ceeaf4c088'; -- 14
+
+delete FROM vegetable_cellar where customerSid='05ba58d6-f1f0-4f68-9bcc-62ceeaf4c088';
+
+SELECT * FROM tmp_cust_goods WHERE customerSid='05ba58d6-f1f0-4f68-9bcc-62ceeaf4c088';
+
+
+	INSERT INTO vegetable_cellar(sid,customerSid,goodsSid,goodsNumber)
+	SELECT 
+	   UUID(),
+		customerSid,
+		goodsSid,
+		SUM(goodsNumber) AS goodsNumber
+	FROM tmp_cust_goods
+	where customerSid='05ba58d6-f1f0-4f68-9bcc-62ceeaf4c088' and serialNumber not in ('00000014') 
+	GROUP BY customerSid,goodsSid
+	HAVING goodsNumber>0 
+
+
+delete FROM vegetable_cellar where customerSid='e157745c-856a-472d-a81e-2975312bf171';
+
+	INSERT INTO vegetable_cellar(sid,customerSid,goodsSid,goodsNumber)
+	SELECT 
+	   UUID(),
+		customerSid,
+		goodsSid,
+		SUM(goodsNumber) AS goodsNumber
+	FROM tmp_cust_goods
+	where customerSid='e157745c-856a-472d-a81e-2975312bf171' and serialNumber not in ('00000001') 
+	GROUP BY customerSid,goodsSid
+	HAVING goodsNumber>0 
+	
+	
+	delete FROM vegetable_cellar where customerSid='e569243c-1830-4316-8b4e-d4568b5a151d';
+	
+		INSERT INTO vegetable_cellar(sid,customerSid,goodsSid,goodsNumber)
+		SELECT 
+		   UUID(),
+			customerSid,
+			goodsSid,
+			SUM(goodsNumber) AS goodsNumber
+		FROM tmp_cust_goods
+		where customerSid='e569243c-1830-4316-8b4e-d4568b5a151d' and serialNumber not in ('00000002') 
+		GROUP BY customerSid,goodsSid
+		HAVING goodsNumber>0 
+		
+		
+		delete FROM vegetable_cellar where customerSid='e0f2b745-8055-48bc-a506-ff09dd82ddb5';
+		
+			INSERT INTO vegetable_cellar(sid,customerSid,goodsSid,goodsNumber)
+			SELECT 
+			   UUID(),
+				customerSid,
+				goodsSid,
+				SUM(goodsNumber) AS goodsNumber
+			FROM tmp_cust_goods
+			where customerSid='e0f2b745-8055-48bc-a506-ff09dd82ddb5' and serialNumber not in ('00000010') 
+			GROUP BY customerSid,goodsSid
+			HAVING goodsNumber>0 
+			
+			
--- a/docs/databases/数据备份/yxt_lpk_yyth-全部-20240121162617.sql
+++ b/docs/databases/数据备份/yxt_lpk_yyth-全部-20240121162617.sql
--- a/docs/databases/菜窖明细.sql
+++ b/docs/databases/菜窖明细.sql
@ -0,0 +1,62 @@
+SELECT
+	r.wxMpOpenid,
+	d.CODE,
+	e.NAME AS goodsName,
+	s.goodsNumber AS goodsNumber,
+CASE 
+		WHEN r.wxMpOpenid IS NOT NULL 
+		then '家庭菜窖'
+	END type 
+FROM
+	lpk_giftcard d
+	LEFT JOIN lpk_customer r ON r.sid = d.customerSid
+	LEFT JOIN lpk_giftbag_goods s ON s.giftbagSid = d.giftbagSid
+	LEFT JOIN lpk_goods e ON e.sid = s.goodsSid 
+WHERE
+	customerSid IS NOT NULL 
+	AND customerSid != '' 
+ UNION
+SELECT
+	r.wxMpOpenid,
+	d.CODE,
+	e.NAME AS goodsName,
+	s.goodsNumber AS goodsNumber,
+CASE
+		
+		WHEN r.wxMpOpenid IS NOT NULL 
+		then '企业菜窖' 
+	END type 
+FROM
+	emp_card d
+	LEFT JOIN lpk_customer r ON r.sid = d.customerSid
+	LEFT JOIN lpk_giftbag_goods s ON s.giftbagSid = d.giftbagSid
+	LEFT JOIN lpk_goods e ON e.sid = s.goodsSid 
+WHERE
+	customerSid IS NOT NULL 
+	AND customerSid != '' 
+ UNION
+SELECT
+	r.wxMpOpenid,
+	d.CODE,
+	e.NAME AS goodsName,
+	s.goodsNumber AS goodsNumber,
+CASE
+		
+		WHEN r.wxMpOpenid IS NOT NULL 
+		then '购买的家庭菜窖' 
+	END type 
+FROM
+	emp_card_gift d
+	LEFT JOIN lpk_customer r ON r.sid = d.customerSid
+	LEFT JOIN emp_card_gift_goods s ON s.empCardGiftSid = d.sid
+	LEFT JOIN lpk_goods e ON e.sid = s.goodsSid 
+WHERE
+	customerSid IS NOT NULL 
+	AND customerSid != '' 
+	AND isSenior = '1' 
+GROUP BY
+	CODE,
+	NAME 
+ORDER BY
+	wxMpOpenid,
+	CODE
--- a/src/main/java/com/yxt/yythmall/adminapi/AdminBankRest.java
+++ b/src/main/java/com/yxt/yythmall/adminapi/AdminBankRest.java
@ -0,0 +1,41 @@
+package com.yxt.yythmall.adminapi;
+
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.yythmall.adminapi.vo.PmsBrandVo;
+import com.yxt.yythmall.adminapi.vo.PmsProductCategoryVo;
+import com.yxt.yythmall.adminservice.AdminMallService;
+import com.yxt.yythmall.api.lpkbank.LpkBank;
+import com.yxt.yythmall.api.lpkstore.LpkStore;
+import com.yxt.yythmall.biz.lpkbank.LpkBankService;
+import com.yxt.yythmall.biz.lpkstore.LpkStoreService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController("com.yxt.yythmall.adminapi.AdminBankRest")
+@RequestMapping("/adminapi/bank")
+public class AdminBankRest {
+
+    @Autowired
+    private LpkBankService lpkBankService;
+    @Autowired
+    private LpkStoreService lpkStoreService;
+
+    @GetMapping(value = "/listBankAll")
+    public ResultBean<List<LpkBank>> listBankAll() {
+        ResultBean rb = ResultBean.fireFail();
+        List<LpkBank> list = lpkBankService.listAllBank();
+        return rb.success().setData(list);
+    }
+
+    @GetMapping(value = "/listStoreOfBank")
+    public ResultBean<List<LpkStore>> listStoreOfBank(@RequestParam(name = "bankSid", required = false) String bankSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<LpkStore> list = lpkStoreService.listStoreOfBank(bankSid);
+        return rb.success().setData(list);
+    }
+}
--- a/src/main/java/com/yxt/yythmall/adminapi/AdminReserveRest.java
+++ b/src/main/java/com/yxt/yythmall/adminapi/AdminReserveRest.java
@ -0,0 +1,33 @@
+package com.yxt.yythmall.adminapi;
+
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.yythmall.adminapi.vo.PmsBrandVo;
+import com.yxt.yythmall.adminapi.vo.PmsProductCategoryVo;
+import com.yxt.yythmall.adminservice.AdminMallService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController("com.yxt.yythmall.adminapi.AdminReserveRest")
+@RequestMapping("/adminapi/reserve")
+public class AdminReserveRest {
+
+    @Autowired
+    private AdminMallService adminMallService;
+
+    @GetMapping(value = "/listAllBrand")
+    public ResultBean<List<PmsBrandVo>> listAllBrand() {
+        ResultBean rb = ResultBean.fireFail();
+        List<PmsBrandVo> list = adminMallService.listBrand();
+        return rb.success().setData(list);
+    }
+    @GetMapping(value = "/listAllCategory")
+    public ResultBean<List<PmsBrandVo>> listAllCategory() {
+        ResultBean rb = ResultBean.fireFail();
+        List<PmsProductCategoryVo> list = adminMallService.listAllCategory();
+        return rb.success().setData(list);
+    }
+}
--- a/src/main/java/com/yxt/yythmall/biz/lpkbank/LpkBankService.java
+++ b/src/main/java/com/yxt/yythmall/biz/lpkbank/LpkBankService.java
@ -1,6 +1,7 @@
 package com.yxt.yythmall.biz.lpkbank;

 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.common.base.service.MybatisBaseService;
@ -68,4 +69,7 @@ public class LpkBankService extends MybatisBaseService<LpkBankMapper, LpkBank> {
    }


+    public List<LpkBank> listAllBank() {
+        return baseMapper.selectList(null);
+    }
 }
--- a/src/main/java/com/yxt/yythmall/biz/lpkstore/LpkStoreService.java
+++ b/src/main/java/com/yxt/yythmall/biz/lpkstore/LpkStoreService.java
@ -2,6 +2,7 @@ package com.yxt.yythmall.biz.lpkstore;

 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateTime;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.common.base.service.MybatisBaseService;
@ -26,7 +27,7 @@ public class LpkStoreService extends MybatisBaseService<LpkStoreMapper, LpkStore
        ResultBean rb = ResultBean.fireFail();
        LpkStoreQuery query = pq.getParams();
        QueryWrapper<LpkStore> qw = new QueryWrapper<>();
-        qw.eq("1","1");
+        qw.eq("1", "1");
        if (StringUtils.isNotBlank(query.getName())) {
            qw.like("st.name", query.getName());
        }
@ -69,36 +70,45 @@ public class LpkStoreService extends MybatisBaseService<LpkStoreMapper, LpkStore
    }

    /**
-     *
     * @return
     */
-    public ResultBean<List<StoreSelect>> getAllStore(){
-        ResultBean rb=new ResultBean();
-        List<StoreSelect> vos= baseMapper.getAllStore();
+    public ResultBean<List<StoreSelect>> getAllStore() {
+        ResultBean rb = new ResultBean();
+        List<StoreSelect> vos = baseMapper.getAllStore();
        return rb.success().setData(vos);
    }
-    public ResultBean<List<LpkStoreVo>> getAllStoreByQuery(LpkStoreQuery query){
-        ResultBean rb=new ResultBean();
+
+    public ResultBean<List<LpkStoreVo>> getAllStoreByQuery(LpkStoreQuery query) {
+        ResultBean rb = new ResultBean();
        QueryWrapper<LpkStore> qw = new QueryWrapper<>();
        if (StringUtils.isNotBlank(query.getName())) {
            qw.like("name", query.getName());
        }
        qw.eq("isEnable", "1");
        qw.orderByDesc("sort");
-        List<LpkStoreVo> vos= baseMapper.getAllStoreByQuery(qw);
+        List<LpkStoreVo> vos = baseMapper.getAllStoreByQuery(qw);
        return rb.success().setData(vos);
    }
-    public ResultBean updateIsEnable(String sid,String isEnable){
-        ResultBean rb=new ResultBean();
+
+    public ResultBean updateIsEnable(String sid, String isEnable) {
+        ResultBean rb = new ResultBean();
        LpkStore lpkStore = fetchBySid(sid);
        lpkStore.setIsEnable(isEnable);
-        int i= baseMapper.updateById(lpkStore);
+        int i = baseMapper.updateById(lpkStore);
        return rb.success().setMsg("修改成功");
    }

    public ResultBean<List<StoreSelect>> getSelectStore() {
-        ResultBean rb=new ResultBean();
-        List<StoreSelect> vos= baseMapper.getSelectStore();
+        ResultBean rb = new ResultBean();
+        List<StoreSelect> vos = baseMapper.getSelectStore();
        return rb.success().setData(vos);
    }
+
+    public List<LpkStore> listStoreOfBank(String bankSid) {
+        if (StrUtil.isBlank(bankSid))
+            return this.list();
+        QueryWrapper<LpkStore> qw = new QueryWrapper<>();
+        qw.eq("bankSid", bankSid);
+        return baseMapper.selectList(qw);
+    }
 }
--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@ -22,7 +22,7 @@ spring:
    timeout: 0  # 连接超时时间（毫秒）
 image:
  upload:
-    path: D:/webapps/lipinka/yyth-ui/upload/
+    path: D:/webapps/lipinka/yythmall-ui/upload/
  url:
    prefix: https://supervise.yxtsoft.com/lpk/upload/
 import: