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