From 7e7db2fa55a9a3af46d4fd8ede0dee147f101d64 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 09 五月 2020 21:41:27 +0800
Subject: [PATCH] 2.1需求

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/shop/BanLiShopGoodsSetsPayAdminController.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/shop/BanLiShopGoodsSetsPayAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/shop/BanLiShopGoodsSetsPayAdminController.java
index b6df234..a3fc2f6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/shop/BanLiShopGoodsSetsPayAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/shop/BanLiShopGoodsSetsPayAdminController.java
@@ -14,9 +14,11 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.yeshi.fanli.entity.shop.BanLiShopGoodsSets;
 import com.yeshi.fanli.entity.shop.BanLiShopGoodsSetsPay;
 import com.yeshi.fanli.exception.shop.BanLiShopGoodsSetPayException;
 import com.yeshi.fanli.service.inter.shop.BanLiShopGoodsSetPayService;
+import com.yeshi.fanli.service.inter.shop.BanLiShopGoodsSetService;
 import com.yeshi.fanli.tag.PageEntity;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.StringUtil;
@@ -30,11 +32,14 @@
 	@Resource
 	private BanLiShopGoodsSetPayService banLiShopGoodsSetPayService;
 	
+	@Resource
+	private BanLiShopGoodsSetService banLiShopGoodsSetService;
+	
 	
 	@RequestMapping(value = "save")
 	public void save(String callback, BanLiShopGoodsSetsPay record, HttpServletRequest request, PrintWriter out) {
 		try {
-			banLiShopGoodsSetPayService.addSetPay(record);
+			banLiShopGoodsSetPayService.saveObject(record);
 			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
 		} catch (BanLiShopGoodsSetPayException e) {
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
@@ -98,6 +103,13 @@
 				return;
 			}
 			
+			for (BanLiShopGoodsSetsPay setsPay: list) {
+				BanLiShopGoodsSets goodsSet = setsPay.getGoodsSet();
+				if (goodsSet != null) {
+					setsPay.setGoodsSet(banLiShopGoodsSetService.selectByPrimaryKey(goodsSet.getId()));
+				}
+			}
+			
 			long count = banLiShopGoodsSetPayService.countQuery(key, payType, setId);
 			
 			int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);

--
Gitblit v1.8.0