Home Explore Help
Sign In
caimei365
/
caimei365-manager
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

组织名称显示

Aslee 4 years ago
parent
76cea16734
commit
12ec82840a
3 changed files with 12 additions and 4 deletions
Unified View Show Diff Stats
  1. 7 1
      src/main/java/com/caimei/modules/weisha/web/CmOrganizeProductController.java
  2. 2 0
      src/main/resources/mappings/modules/weisha/CmOrganizeProductMapper.xml
  3. 3 3
      src/main/webapp/WEB-INF/views/modules/weisha/cmOrganizeProductList.jsp

+ 7 - 1
src/main/java/com/caimei/modules/weisha/web/CmOrganizeProductController.java
View File 

@@ -5,7 +5,9 @@ import javax.servlet.http.HttpServletResponse;
 
 
 
 import com.caimei.modules.product.entity.Product;
 
 import com.caimei.modules.product.entity.Product;
 
 import com.caimei.modules.product.entity.ProductDetailInfo;
 
 import com.caimei.modules.product.entity.ProductDetailInfo;
 
+import com.caimei.modules.weisha.entity.CmMallOrganize;
 
 import com.caimei.modules.weisha.entity.OrganizeProductLadderPrice;
 
 import com.caimei.modules.weisha.entity.OrganizeProductLadderPrice;
 
+import com.caimei.modules.weisha.service.CmMallOrganizeService;
 
 import com.caimei.po.ProductLadderPrice;
 
 import com.caimei.po.ProductLadderPrice;
 
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 
 import org.apache.shiro.crypto.hash.Hash;
 
 import org.apache.shiro.crypto.hash.Hash;
 
@@ -40,6 +42,8 @@ public class CmOrganizeProductController extends BaseController {
 
 
 
 	@Autowired
 
 	@Autowired
 
 	private CmOrganizeProductService cmOrganizeProductService;
 
 	private CmOrganizeProductService cmOrganizeProductService;
 
+	@Autowired
 
+	private CmMallOrganizeService cmMallOrganizeService;
 
 	
 	
 	@ModelAttribute
 
 	@ModelAttribute
 
 	public CmOrganizeProduct get(@RequestParam(required=false) String id) {
 
 	public CmOrganizeProduct get(@RequestParam(required=false) String id) {
 
@@ -58,6 +62,8 @@ public class CmOrganizeProductController extends BaseController {
 
 		Page<CmOrganizeProduct> page = cmOrganizeProductService.findPage(new Page<CmOrganizeProduct>(request, response), cmOrganizeProduct); 
 		Page<CmOrganizeProduct> page = cmOrganizeProductService.findPage(new Page<CmOrganizeProduct>(request, response), cmOrganizeProduct); 
 		model.addAttribute("page", page);
 
 		model.addAttribute("page", page);
 
 		model.addAttribute("organizeId", cmOrganizeProduct.getOrganizeId());
 
 		model.addAttribute("organizeId", cmOrganizeProduct.getOrganizeId());
 
+		CmMallOrganize cmMallOrganize = cmMallOrganizeService.get(cmOrganizeProduct.getOrganizeId().toString());
 
+		model.addAttribute("organizeName", cmMallOrganize.getOrganizeName());
 
 		return "modules/weisha/cmOrganizeProductList";
 
 		return "modules/weisha/cmOrganizeProductList";
 
 	}
 
 	}
 
 
 
@@ -78,7 +84,7 @@ public class CmOrganizeProductController extends BaseController {
 
 		}
 
 		}
 
 		cmOrganizeProductService.save(cmOrganizeProduct);
 
 		cmOrganizeProductService.save(cmOrganizeProduct);
 
 		addMessage(redirectAttributes, "保存组织商品成功");
 
 		addMessage(redirectAttributes, "保存组织商品成功");
 
-		return "redirect:"+Global.getAdminPath()+"/weisha/cmOrganizeProduct/?repage";
 
+		return "redirect:" + Global.getAdminPath() + "/weisha/cmOrganizeProduct/?repage&organizeId=" + cmOrganizeProduct.getOrganizeId();
 
 	}
 
 	}
 
 	
 	
 	@RequestMapping(value = "delete")
 
 	@RequestMapping(value = "delete")

+ 2 - 0
src/main/resources/mappings/modules/weisha/CmOrganizeProductMapper.xml
View File 

@@ -167,6 +167,8 @@
 
 			price = #{price},
 
 			price = #{price},
 
 			includedTax = #{includedTax},
 
 			includedTax = #{includedTax},
 
 			invoiceType = #{invoiceType},
 
 			invoiceType = #{invoiceType},
 
+		    clubTaxPoint = #{clubTaxPoint},
 
+		    shopTaxPoint = #{shopTaxPoint},
 
 			minBuyNumber = #{minBuyNumber},
 
 			minBuyNumber = #{minBuyNumber},
 
 			costType = #{costType},
 
 			costType = #{costType},
 
 			costPrice = #{costPrice},
 
 			costPrice = #{costPrice},

+ 3 - 3
src/main/webapp/WEB-INF/views/modules/weisha/cmOrganizeProductList.jsp
View File 

@@ -99,7 +99,8 @@
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
 	<ul class="nav nav-tabs">
 
 	<ul class="nav nav-tabs">
 
-		<li class="active"><a href="${ctx}/weisha/cmOrganizeProduct/?organizeId=${organizeId}">组织商品列表</a></li>
 
+		<li><a href="${ctx}/weisha/cmMallOrganize/">组织列表</a></li>
 
+		<li class="active"><a href="${ctx}/weisha/cmOrganizeProduct/?organizeId=${organizeId}">商品列表</a></li>
 
 		<shiro:hasPermission name="weisha:cmOrganizeProduct:edit"><li><a href="${ctx}/weisha/cmOrganizeProduct/form">组织商品添加</a></li></shiro:hasPermission>
 
 		<shiro:hasPermission name="weisha:cmOrganizeProduct:edit"><li><a href="${ctx}/weisha/cmOrganizeProduct/form">组织商品添加</a></li></shiro:hasPermission>
 
 	</ul>
 
 	</ul>
 
 	<form:form id="searchForm" modelAttribute="cmOrganizeProduct" action="${ctx}/weisha/cmOrganizeProduct/" method="post" class="breadcrumb form-search">
 
 	<form:form id="searchForm" modelAttribute="cmOrganizeProduct" action="${ctx}/weisha/cmOrganizeProduct/" method="post" class="breadcrumb form-search">
 
@@ -135,8 +136,6 @@
 
 					<form:option value="3" label="不能开票"/>
 
 					<form:option value="3" label="不能开票"/>
 
 				</form:select>
 
 				</form:select>
 
 			</div>
 
 			</div>
 
-
 
-
 
 			&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
 
 			&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
 
 			&nbsp;&nbsp;<input type="button" class="btn btn-primary" onclick="showSelect()" value="添加商品"></input>
 
 			&nbsp;&nbsp;<input type="button" class="btn btn-primary" onclick="showSelect()" value="添加商品"></input>
 
 			<div class="clearfix"></div>
 
 			<div class="clearfix"></div>
 
@@ -144,6 +143,7 @@
 
 
 
 	</form:form>
 
 	</form:form>
 
 	<sys:message content="${message}"/>
 
 	<sys:message content="${message}"/>
 
+	<font color="blue">当前组织：${organizeName}</font>
 
 	<table id="contentTable" class="table table-striped table-bordered table-condensed">
 
 	<table id="contentTable" class="table table-striped table-bordered table-condensed">
 
 		<thead>
 
 		<thead>
 
 			<tr>
 
 			<tr>