过期代码bugfix

src/main/java/com/caimei/modules/activity/dao/FreeShippingDao.java

@@ -1,18 +0,0 @@
-package com.caimei.modules.activity.dao;
-
-import com.caimei.modules.activity.entity.FreeShipping;
-import com.caimei.modules.activity.model.FreeShippingCount;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-
-/**
- * 包邮券管理DAO接口
- * @author LG
- * @version 2016-05-31
- */
-@MyBatisDao
-public interface FreeShippingDao extends CrudDao<FreeShipping> {
-
-	FreeShippingCount usedCount();
-	
-}

src/main/java/com/caimei/modules/activity/dao/FreeShippingTypeDao.java

@@ -1,15 +0,0 @@
-package com.caimei.modules.activity.dao;
-
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.activity.entity.FreeShippingType;
-
-/**
- * 包邮券设置DAO接口
- * @author LG
- * @version 2016-05-31
- */
-@MyBatisDao
-public interface FreeShippingTypeDao extends CrudDao<FreeShippingType> {
-	
-}

src/main/java/com/caimei/modules/activity/dao/LaserDao.java

@@ -1,15 +0,0 @@
-package com.caimei.modules.activity.dao;
-
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.activity.entity.Laser;
-
-/**
- * 激光之美DAO接口
- * @author LG
- * @version 2016-11-14
- */
-@MyBatisDao
-public interface LaserDao extends CrudDao<Laser> {
-	
-}

src/main/java/com/caimei/modules/activity/entity/FreeShipping.java

@@ -1,165 +0,0 @@
-package com.caimei.modules.activity.entity;
-
-import org.hibernate.validator.constraints.Length;
-
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-
-/**
- * 包邮券管理Entity
- * @author LG
- * @version 2016-05-31
- */
-public class FreeShipping extends DataEntity<FreeShipping> {
-	
-	private static final long serialVersionUID = 1L;
-	private FreeShippingType freeShippingtTpe;		// 包邮券类型
-	
-	private Long userId;		// 用户Id
-	private String userName;	// 用户名
-	private String userLevelType;//会员等级
-	
-	private Long clubId;		// 会所
-	private String clubName;	// 会所名称
-	private String clubMobile;	// 会所联系电话
-	
-	private String shopOrederNo;//会所订单号
-	private String shopOrderStatus;//订单状态
-	
-	private String status;		// 使用状态 0未使用 1已使用
-	private String enabledStatus;		// 启用/禁用状态
-
-	private Long spId;//创客ID
-	private String spName;//创客名称
-	private String spLevelId;//创客身份
-	private String spMobile;//创客联系电话
-
-	public FreeShipping() {
-		super();
-	}
-
-	public FreeShipping(String id){
-		super(id);
-	}
-
-	public FreeShippingType getFreeShippingtTpe() {
-		return freeShippingtTpe;
-	}
-
-	public void setFreeShippingtTpe(FreeShippingType freeShippingtTpe) {
-		this.freeShippingtTpe = freeShippingtTpe;
-	}
-	
-	public Long getUserId() {
-		return userId;
-	}
-
-	public void setUserId(Long userId) {
-		this.userId = userId;
-	}
-
-	public Long getClubId() {
-		return clubId;
-	}
-
-	public void setClubId(Long clubId) {
-		this.clubId = clubId;
-	}
-	
-	@Length(min=0, max=1, message="使用状态 0未使用 1已使用长度必须介于 0 和 1 之间")
-	public String getStatus() {
-		return status;
-	}
-
-	public void setStatus(String status) {
-		this.status = status;
-	}
-	
-	@Length(min=0, max=1, message="启用/禁用状态长度必须介于 0 和 1 之间")
-	public String getEnabledStatus() {
-		return enabledStatus;
-	}
-
-	public void setEnabledStatus(String enabledStatus) {
-		this.enabledStatus = enabledStatus;
-	}
-
-	public String getUserName() {
-		return userName;
-	}
-
-	public void setUserName(String userName) {
-		this.userName = userName;
-	}
-
-	public String getUserLevelType() {
-		return userLevelType;
-	}
-
-	public void setUserLevelType(String userLevelType) {
-		this.userLevelType = userLevelType;
-	}
-
-	public String getClubName() {
-		return clubName;
-	}
-
-	public void setClubName(String clubName) {
-		this.clubName = clubName;
-	}
-
-	public String getClubMobile() {
-		return clubMobile;
-	}
-
-	public void setClubMobile(String clubMobile) {
-		this.clubMobile = clubMobile;
-	}
-
-	public String getShopOrederNo() {
-		return shopOrederNo;
-	}
-
-	public void setShopOrederNo(String shopOrederNo) {
-		this.shopOrederNo = shopOrederNo;
-	}
-
-	public String getShopOrderStatus() {
-		return shopOrderStatus;
-	}
-
-	public void setShopOrderStatus(String shopOrderStatus) {
-		this.shopOrderStatus = shopOrderStatus;
-	}
-
-	public Long getSpId() {
-		return spId;
-	}
-
-	public void setSpId(Long spId) {
-		this.spId = spId;
-	}
-
-	public String getSpLevelId() {
-		return spLevelId;
-	}
-
-	public void setSpLevelId(String spLevelId) {
-		this.spLevelId = spLevelId;
-	}
-
-	public String getSpName() {
-		return spName;
-	}
-
-	public void setSpName(String spName) {
-		this.spName = spName;
-	}
-
-	public String getSpMobile() {
-		return spMobile;
-	}
-
-	public void setSpMobile(String spMobile) {
-		this.spMobile = spMobile;
-	}
-}

src/main/java/com/caimei/modules/activity/entity/FreeShippingType.java

@@ -1,113 +0,0 @@
-package com.caimei.modules.activity.entity;
-
-import org.hibernate.validator.constraints.Length;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-
-/**
- * 包邮券设置Entity
- * @author LG
- * @version 2016-05-31
- */
-public class FreeShippingType extends DataEntity<FreeShippingType> {
-	
-	private static final long serialVersionUID = 1L;
-	private String scope;		// 使用范围
-	private String number;		// 可使用数量
-	private Date startTime;		// 有效期开始时间
-	private Date endTime;		// 有效期截止时间
-	private String info;		// 使用须知
-	private String images;		// 网站端图片
-	private String crmImages;		// CRM端图片
-	private String status;		// 可领取状态 0否 1是
-	private String enabledStatus;		// 可使用状态 0否 1是
-	
-	public FreeShippingType() {
-		super();
-	}
-
-	public FreeShippingType(String id){
-		super(id);
-	}
-
-	@Length(min=0, max=100, message="使用范围长度必须介于 0 和 100 之间")
-	public String getScope() {
-		return scope;
-	}
-
-	public void setScope(String scope) {
-		this.scope = scope;
-	}
-	
-	@Length(min=1, max=11, message="可使用数量长度必须介于 1 和 11 之间")
-	public String getNumber() {
-		return number;
-	}
-
-	public void setNumber(String number) {
-		this.number = number;
-	}
-	
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	public Date getStartTime() {
-		return startTime;
-	}
-
-	public void setStartTime(Date startTime) {
-		this.startTime = startTime;
-	}
-	
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	public Date getEndTime() {
-		return endTime;
-	}
-
-	public void setEndTime(Date endTime) {
-		this.endTime = endTime;
-	}
-	
-	public String getInfo() {
-		return info;
-	}
-
-	public void setInfo(String info) {
-		this.info = info;
-	}
-	
-	public String getImages() {
-		return images;
-	}
-
-	public void setImages(String images) {
-		this.images = images;
-	}
-	
-	public String getCrmImages() {
-		return crmImages;
-	}
-
-	public void setCrmImages(String crmImages) {
-		this.crmImages = crmImages;
-	}
-	
-	@Length(min=0, max=1, message="可领取状态 0否 1是长度必须介于 0 和 1 之间")
-	public String getStatus() {
-		return status;
-	}
-
-	public void setStatus(String status) {
-		this.status = status;
-	}
-	
-	@Length(min=0, max=1, message="可使用状态 0否 1是长度必须介于 0 和 1 之间")
-	public String getEnabledStatus() {
-		return enabledStatus;
-	}
-
-	public void setEnabledStatus(String enabledStatus) {
-		this.enabledStatus = enabledStatus;
-	}
-	
-}

src/main/java/com/caimei/modules/activity/entity/Laser.java

@@ -1,62 +0,0 @@
-package com.caimei.modules.activity.entity;
-
-import org.hibernate.validator.constraints.Length;
-
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-
-/**
- * 激光之美Entity
- * @author LG
- * @version 2016-11-14
- */
-public class Laser extends DataEntity<Laser> {
-	
-	private static final long serialVersionUID = 1L;
-	private String title;		// 标题
-	private String image;		// 图片
-	private Integer sortIndex;		// 排序
-	private String enabledStatus;		// 状态
-	
-	public Laser() {
-		super();
-	}
-
-	public Laser(String id){
-		super(id);
-	}
-
-	@Length(min=0, max=200, message="标题长度必须介于 0 和 200 之间")
-	public String getTitle() {
-		return title;
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
-	
-	public String getImage() {
-		return image;
-	}
-
-	public void setImage(String image) {
-		this.image = image;
-	}
-	
-	public Integer getSortIndex() {
-		return sortIndex;
-	}
-
-	public void setSortIndex(Integer sortIndex) {
-		this.sortIndex = sortIndex;
-	}
-	
-	@Length(min=0, max=1, message="状态长度必须介于 0 和 1 之间")
-	public String getEnabledStatus() {
-		return enabledStatus;
-	}
-
-	public void setEnabledStatus(String enabledStatus) {
-		this.enabledStatus = enabledStatus;
-	}
-	
-}

src/main/java/com/caimei/modules/activity/model/FreeShippingCount.java

@@ -1,41 +0,0 @@
-package com.caimei.modules.activity.model;
-
-/**
- * 使用情况统计
- * @author LG
- * @date  2016年5月31日
- * @version 1.0
- */
-public class FreeShippingCount {
-	
-	private Long total; //总数
-	private Long unused;//未使用
-	private Long used;	//已使用
-	private Long unpay;	//未付款
-	
-	public Long getTotal() {
-		return total;
-	}
-	public void setTotal(Long total) {
-		this.total = total;
-	}
-	public Long getUnused() {
-		return unused;
-	}
-	public void setUnused(Long unused) {
-		this.unused = unused;
-	}
-	public Long getUsed() {
-		return used;
-	}
-	public void setUsed(Long used) {
-		this.used = used;
-	}
-	public Long getUnpay() {
-		return unpay;
-	}
-	public void setUnpay(Long unpay) {
-		this.unpay = unpay;
-	}
-
-}

src/main/java/com/caimei/modules/activity/service/FreeShippingService.java

@@ -1,58 +0,0 @@
-package com.caimei.modules.activity.service;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.caimei.modules.activity.dao.FreeShippingDao;
-import com.caimei.modules.activity.entity.FreeShipping;
-import com.caimei.modules.activity.model.FreeShippingCount;
-
-/**
- * 包邮券管理Service
- * @author LG
- * @version 2016-05-31
- */
-@Service
-@Transactional(readOnly = true)
-public class FreeShippingService extends CrudService<FreeShippingDao, FreeShipping> {
-	
-	@Autowired
-	private FreeShippingDao freeShippingDao;
-
-	public FreeShipping get(String id) {
-		return super.get(id);
-	}
-	
-	public List<FreeShipping> findList(FreeShipping freeShipping) {
-		return super.findList(freeShipping);
-	}
-	
-	public Page<FreeShipping> findPage(Page<FreeShipping> page, FreeShipping freeShipping) {
-		return super.findPage(page, freeShipping);
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(FreeShipping freeShipping) {
-		super.save(freeShipping);
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(FreeShipping freeShipping) {
-		super.delete(freeShipping);
-	}
-	
-	@Transactional(readOnly = false)
-	public void updateEnabledStatusByIds(String enabledStatus, String[] ids) {
-		freeShippingDao.updateEnabledStatusByIds(enabledStatus,ids);
-	}
-
-	public FreeShippingCount usedCount() {
-		return freeShippingDao.usedCount();
-	}
-	
-}

src/main/java/com/caimei/modules/activity/service/FreeShippingTypeService.java

@@ -1,87 +0,0 @@
-package com.caimei.modules.activity.service;
-
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import com.caimei.modules.sys.utils.UploadImageUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.thinkgem.jeesite.common.config.Global;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.caimei.modules.activity.entity.FreeShippingType;
-import com.caimei.modules.brand.utils.ImagePathUtils;
-import com.caimei.utils.Encodes;
-import com.caimei.utils.StringUtils;
-import com.caimei.dfs.image.beens.ImageUploadInfo;
-import com.caimei.modules.activity.dao.FreeShippingTypeDao;
-
-/**
- * 包邮券设置Service
- * @author LG
- * @version 2016-05-31
- */
-@Service
-@Transactional(readOnly = true)
-public class FreeShippingTypeService extends CrudService<FreeShippingTypeDao, FreeShippingType> {
-
-	public FreeShippingType get(String id) {
-		return super.get(id);
-	}
-	
-	public List<FreeShippingType> findList(FreeShippingType freeShippingType) {
-		return super.findList(freeShippingType);
-	}
-	
-	public Page<FreeShippingType> findPage(Page<FreeShippingType> page, FreeShippingType freeShippingType) {
-		return super.findPage(page, freeShippingType);
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(FreeShippingType freeShippingType, HttpServletRequest request) {
-			//网站图片上传
-			String images=freeShippingType.getImages();
-			if(StringUtils.isNotBlank(images) && !images.contains("http:") && !images.contains("https:")){
-				images=Encodes.urlDecode(images);
-//				String realPath = request.getSession().getServletContext().getRealPath(images);
-                String realPath = UploadImageUtils.getAbsolutePath(images);
-//				realPath=Encodes.urlDecode(realPath);
-				int pointerIndex = realPath.lastIndexOf(".");
-				ImageUploadInfo saveImageSerivce=new ImageUploadInfo();
-				String photoServer = Global.getConfig("photoServer");
-				try {
-					saveImageSerivce = ImagePathUtils.saveImageSerivce(realPath, pointerIndex,realPath);
-					freeShippingType.setImages(photoServer+saveImageSerivce.getSource());
-				} catch (Exception e) {
-					logger.error("网站图片上传错误:"+e.toString(),e);
-				}
-			}
-			//crm图片上传
-			String crmImages=freeShippingType.getCrmImages();
-			if(StringUtils.isNotBlank(crmImages) && !crmImages.contains("http:") && !crmImages.contains("https:")){
-				crmImages=Encodes.urlDecode(crmImages);
-//				String realPath = request.getSession().getServletContext().getRealPath(crmImages);
-                String realPath = UploadImageUtils.getAbsolutePath(crmImages);
-//				realPath=Encodes.urlDecode(realPath);
-				int pointerIndex = realPath.lastIndexOf(".");
-				ImageUploadInfo saveImageSerivce=new ImageUploadInfo();
-				String photoServer = Global.getConfig("photoServer");
-				try {
-					saveImageSerivce = ImagePathUtils.saveImageSerivce(realPath, pointerIndex,realPath);
-					freeShippingType.setCrmImages(photoServer+saveImageSerivce.getSource());
-				} catch (Exception e) {
-					logger.error("crm图片上传错误:"+e.toString(),e);
-				}
-			}
-		
-		super.save(freeShippingType);
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(FreeShippingType freeShippingType) {
-		super.delete(freeShippingType);
-	}
-	
-}

src/main/java/com/caimei/modules/activity/service/LaserService.java

@@ -1,70 +0,0 @@
-package com.caimei.modules.activity.service;
-
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import com.caimei.modules.sys.utils.UploadImageUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.caimei.dfs.image.beens.ImageUploadInfo;
-import com.caimei.modules.activity.dao.LaserDao;
-import com.caimei.modules.activity.entity.Laser;
-import com.caimei.modules.common.utils.UploadUtils;
-import com.thinkgem.jeesite.common.config.Global;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.thinkgem.jeesite.common.utils.Encodes;
-import com.thinkgem.jeesite.common.utils.StringUtils;
-
-/**
- * 激光之美Service
- * @author LG
- * @version 2016-11-14
- */
-@Service
-@Transactional(readOnly = true)
-public class LaserService extends CrudService<LaserDao, Laser> {
-
-	public Laser get(String id) {
-		return super.get(id);
-	}
-	
-	public List<Laser> findList(Laser laser) {
-		return super.findList(laser);
-	}
-	
-	public Page<Laser> findPage(Page<Laser> page, Laser laser) {
-		return super.findPage(page, laser);
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(Laser laser, HttpServletRequest request) {
-		
-		String photoServer = Global.getConfig("photoServer");//获取文件服务器地址
-		
-		String images=laser.getImage();
-		if(StringUtils.isNotBlank(images) && !images.startsWith("http:")&& !images.startsWith("https:")){
-			images=Encodes.urlDecode(images);
-//			String realPath = request.getSession().getServletContext().getRealPath(images);
-            String realPath = UploadImageUtils.getAbsolutePath(images);
-//			realPath=Encodes.urlDecode(realPath);
-			int pointerIndex = realPath.lastIndexOf(".");
-			ImageUploadInfo saveImageSerivce=new ImageUploadInfo();
-			try {
-				saveImageSerivce = UploadUtils.saveImageSerivce(realPath, pointerIndex,realPath);
-				laser.setImage(photoServer+saveImageSerivce.getSource());
-			} catch (Exception e) {
-				logger.error("图片上传错误:"+e.toString(),e);
-			}
-		}
-		super.save(laser);
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(Laser laser) {
-		super.delete(laser);
-	}
-	
-}

src/main/java/com/caimei/modules/activity/web/FreeShippingController.java

@@ -1,112 +0,0 @@
-package com.caimei.modules.activity.web;
-
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.caimei.modules.activity.entity.FreeShipping;
-import com.caimei.modules.activity.model.FreeShippingCount;
-import com.caimei.modules.activity.service.FreeShippingService;
-import com.google.common.collect.Maps;
-import com.thinkgem.jeesite.common.config.Global;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.utils.StringUtils;
-import com.thinkgem.jeesite.common.web.BaseController;
-
-/**
- * 包邮券管理Controller
- * @author LG
- * @version 2016-05-31
- */
-@Controller
-@RequestMapping(value = "${adminPath}/activity/freeShipping")
-public class FreeShippingController extends BaseController {
-
-	@Autowired
-	private FreeShippingService freeShippingService;
-	
-	@ModelAttribute
-	public FreeShipping get(@RequestParam(required=false) String id) {
-		FreeShipping entity = null;
-		if (StringUtils.isNotBlank(id)){
-			entity = freeShippingService.get(id);
-		}
-		if (entity == null){
-			entity = new FreeShipping();
-		}
-		return entity;
-	}
-	
-	@RequiresPermissions("activity:freeShipping:view")
-	@RequestMapping(value = {"list", ""})
-	public String list(FreeShipping freeShipping, HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<FreeShipping> page = freeShippingService.findPage(new Page<FreeShipping>(request, response), freeShipping); 
-		FreeShippingCount count=freeShippingService.usedCount();
-		model.addAttribute("page", page);
-		model.addAttribute("count", count);
-		return "modules/activity/freeShippingList";
-	}
-
-	@RequiresPermissions("activity:freeShipping:view")
-	@RequestMapping(value = "form")
-	public String form(FreeShipping freeShipping, Model model) {
-		model.addAttribute("freeShipping", freeShipping);
-		return "modules/activity/freeShippingForm";
-	}
-
-	@RequiresPermissions("activity:freeShipping:edit")
-	@RequestMapping(value = "save")
-	public String save(FreeShipping freeShipping, Model model, RedirectAttributes redirectAttributes) {
-		if (!beanValidator(model, freeShipping)){
-			return form(freeShipping, model);
-		}
-		freeShippingService.save(freeShipping);
-		addMessage(redirectAttributes, "保存包邮券管理成功");
-		return "redirect:"+Global.getAdminPath()+"/activity/freeShipping/?repage";
-	}
-	
-	@RequiresPermissions("activity:freeShipping:edit")
-	@RequestMapping(value = "delete")
-	public String delete(FreeShipping freeShipping, RedirectAttributes redirectAttributes) {
-		freeShippingService.delete(freeShipping);
-		addMessage(redirectAttributes, "删除包邮券管理成功");
-		return "redirect:"+Global.getAdminPath()+"/activity/freeShipping/?repage";
-	}
-	
-	/**
-	 * 批量修改启用、停用状态
-	 * @param enabledStatus
-	 * @param ids
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	@RequiresPermissions("hehe:heheCoupon:edit")
-	@ResponseBody
-	@RequestMapping(value="updateEnabledStatus")
-	public Map<String, Object> updateEnabledStatus(String enabledStatus,String[] ids,HttpServletRequest request,HttpServletResponse response){
-		Map<String, Object> map =Maps.newLinkedHashMap();
-		try {
-			freeShippingService.updateEnabledStatusByIds(enabledStatus,ids);
-			map.put("success",true);
-			map.put("msg", "修改成功");
-		} catch (Exception e) {
-			logger.debug(e.toString(),e);
-			map.put("success",false);
-			map.put("msg", "修改失败");
-		}
-        return map;  
-	}
-
-}

src/main/java/com/caimei/modules/activity/web/FreeShippingTypeController.java

@@ -1,80 +0,0 @@
-package com.caimei.modules.activity.web;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.thinkgem.jeesite.common.config.Global;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.web.BaseController;
-import com.thinkgem.jeesite.common.utils.StringUtils;
-import com.caimei.modules.activity.entity.FreeShippingType;
-import com.caimei.modules.activity.service.FreeShippingTypeService;
-
-/**
- * 包邮券设置Controller
- * @author LG
- * @version 2016-05-31
- */
-@Controller
-@RequestMapping(value = "${adminPath}/activity/freeShippingType")
-public class FreeShippingTypeController extends BaseController {
-
-	@Autowired
-	private FreeShippingTypeService freeShippingTypeService;
-	
-	@ModelAttribute
-	public FreeShippingType get(@RequestParam(required=false) String id) {
-		FreeShippingType entity = null;
-		if (StringUtils.isNotBlank(id)){
-			entity = freeShippingTypeService.get(id);
-		}
-		if (entity == null){
-			entity = new FreeShippingType();
-		}
-		return entity;
-	}
-	
-	@RequiresPermissions("activity:freeShippingType:view")
-	@RequestMapping(value = {"list", ""})
-	public String list(FreeShippingType freeShippingType, HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<FreeShippingType> page = freeShippingTypeService.findPage(new Page<FreeShippingType>(request, response), freeShippingType); 
-		model.addAttribute("page", page);
-		return "modules/activity/freeShippingTypeList";
-	}
-
-	@RequiresPermissions("activity:freeShippingType:view")
-	@RequestMapping(value = "form")
-	public String form(FreeShippingType freeShippingType, Model model) {
-		model.addAttribute("freeShippingType", freeShippingType);
-		return "modules/activity/freeShippingTypeForm";
-	}
-
-	@RequiresPermissions("activity:freeShippingType:edit")
-	@RequestMapping(value = "save")
-	public String save(FreeShippingType freeShippingType, Model model, HttpServletRequest request, RedirectAttributes redirectAttributes) {
-		if (!beanValidator(model, freeShippingType)){
-			return form(freeShippingType, model);
-		}
-		freeShippingTypeService.save(freeShippingType,request);
-		addMessage(redirectAttributes, "保存包邮券设置成功");
-		return "redirect:"+Global.getAdminPath()+"/activity/freeShipping/?repage";
-	}
-	
-	@RequiresPermissions("activity:freeShippingType:edit")
-	@RequestMapping(value = "delete")
-	public String delete(FreeShippingType freeShippingType, RedirectAttributes redirectAttributes) {
-		freeShippingTypeService.delete(freeShippingType);
-		addMessage(redirectAttributes, "删除包邮券设置成功");
-		return "redirect:"+Global.getAdminPath()+"/activity/freeShippingType/?repage";
-	}
-
-}

src/main/java/com/caimei/modules/activity/web/LaserController.java

@@ -1,111 +0,0 @@
-package com.caimei.modules.activity.web;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.caimei.modules.activity.entity.Laser;
-import com.caimei.modules.activity.service.LaserService;
-import com.google.common.collect.Maps;
-import com.thinkgem.jeesite.common.config.Global;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.utils.StringUtils;
-import com.thinkgem.jeesite.common.web.BaseController;
-
-/**
- * 激光之美Controller
- * @author LG
- * @version 2016-11-14
- */
-@Controller
-@RequestMapping(value = "${adminPath}/activity/laser")
-public class LaserController extends BaseController {
-
-	@Autowired
-	private LaserService laserService;
-	
-	@ModelAttribute
-	public Laser get(@RequestParam(required=false) String id) {
-		Laser entity = null;
-		if (StringUtils.isNotBlank(id)){
-			entity = laserService.get(id);
-		}
-		if (entity == null){
-			entity = new Laser();
-		}
-		return entity;
-	}
-	
-	@RequiresPermissions("activity:laser:view")
-	@RequestMapping(value = {"list", ""})
-	public String list(Laser laser, HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<Laser> page = laserService.findPage(new Page<Laser>(request, response), laser); 
-		model.addAttribute("page", page);
-		return "modules/activity/laserList";
-	}
-
-	@RequiresPermissions("activity:laser:view")
-	@RequestMapping(value = "form")
-	public String form(Laser laser, Model model) {
-		if(StringUtils.isEmpty(laser.getId())){
-			laser.getSqlMap().put("orderBy", " ORDER BY a.sortIndex DESC");
-			List<Laser> list = laserService.findList(laser);
-			if(CollectionUtils.isNotEmpty(list)){
-				laser.setSortIndex(list.get(0).getSortIndex()+1);
-			}
-			laser.setEnabledStatus("1");
-		}
-		model.addAttribute("laser", laser);
-		return "modules/activity/laserForm";
-	}
-
-	@RequiresPermissions("activity:laser:edit")
-	@RequestMapping(value = "save")
-	public String save(Laser laser, Model model, RedirectAttributes redirectAttributes, HttpServletRequest request) {
-		if (!beanValidator(model, laser)){
-			return form(laser, model);
-		}
-		laserService.save(laser,request);
-		addMessage(redirectAttributes, "保存激光之美成功");
-		return "redirect:"+Global.getAdminPath()+"/activity/laser/?repage";
-	}
-	
-	@RequiresPermissions("activity:laser:delete")
-	@RequestMapping(value = "delete")
-	public String delete(Laser laser, RedirectAttributes redirectAttributes) {
-		laserService.delete(laser);
-		addMessage(redirectAttributes, "删除激光之美成功");
-		return "redirect:"+Global.getAdminPath()+"/activity/laser/?repage";
-	}
-	
-	@RequiresPermissions("project:project:edit")
-	@ResponseBody
-	@RequestMapping(value="updateEnabledStatus")
-	public Map<String, Object> updateEnabledStatus(String enabledStatus,String[] ids,String [] supplierIDs,HttpServletRequest request,HttpServletResponse response){
-		Map<String, Object> map =Maps.newLinkedHashMap();
-		try {
-			laserService.updateEnabledStatusByIds(enabledStatus,ids);
-			map.put("success",true);
-			map.put("msg", "修改成功");
-		} catch (Exception e) {
-			logger.debug(e.toString(),e);
-			map.put("success",false);
-			map.put("msg", "修改失败");
-		}
-        return map;  
-	}
-
-}

src/main/java/com/caimei/modules/advisory/dao/CmAdvisoryDao.java

@@ -1,18 +0,0 @@
-package com.caimei.modules.advisory.dao;
-
-import com.caimei.modules.advisory.entity.CmAdvisory;
-import com.caimei.modules.user.entity.CmUser;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-
-/**
- * 快速咨询列表DAO接口
- *
- * @author plf
- * @version 2020-04-22
- */
-@MyBatisDao
-public interface CmAdvisoryDao extends CrudDao<CmAdvisory> {
-
-    CmUser findUser(String mobile);
-}

src/main/java/com/caimei/modules/advisory/entity/CmAdvisory.java

@@ -1,84 +0,0 @@
-package com.caimei.modules.advisory.entity;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-import org.hibernate.validator.constraints.Length;
-
-import java.util.Date;
-
-/**
- * 快速咨询列表Entity
- *
- * @author plf
- * @version 2020-04-22
- */
-public class CmAdvisory extends DataEntity<CmAdvisory> {
-
-    private static final long serialVersionUID = 1L;
-    private String name;        // 姓名
-    private String mobile;        // 联系人手机号
-    private Date commitTime;        // 提交时间
-
-    private Boolean operationsStaff = false;  //是否是运营人员
-    private String clubName;  //会所名称
-    private Boolean clubContactPerson = false; //是否是机构联系人
-
-    public Boolean getClubContactPerson() {
-        return clubContactPerson;
-    }
-
-    public void setClubContactPerson(Boolean clubContactPerson) {
-        this.clubContactPerson = clubContactPerson;
-    }
-
-    public String getClubName() {
-        return clubName;
-    }
-
-    public void setClubName(String clubName) {
-        this.clubName = clubName;
-    }
-
-    public Boolean getOperationsStaff() {
-        return operationsStaff;
-    }
-
-    public void setOperationsStaff(Boolean operationsStaff) {
-        this.operationsStaff = operationsStaff;
-    }
-
-    public CmAdvisory() {
-        super();
-    }
-
-    public CmAdvisory(String id) {
-        super(id);
-    }
-
-    @Length(min = 0, max = 50, message = "姓名长度必须介于 0 和 50 之间")
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @Length(min = 0, max = 20, message = "联系人手机号长度必须介于 0 和 20 之间")
-    public String getMobile() {
-        return mobile;
-    }
-
-    public void setMobile(String mobile) {
-        this.mobile = mobile;
-    }
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    public Date getCommitTime() {
-        return commitTime;
-    }
-
-    public void setCommitTime(Date commitTime) {
-        this.commitTime = commitTime;
-    }
-}

src/main/java/com/caimei/modules/advisory/service/CmAdvisoryService.java

@@ -1,73 +0,0 @@
-package com.caimei.modules.advisory.service;
-
-import com.caimei.modules.advisory.dao.CmAdvisoryDao;
-import com.caimei.modules.advisory.entity.CmAdvisory;
-import com.caimei.modules.user.dao.CmOperationUserDao;
-import com.caimei.modules.user.dao.NewCmClubDao;
-import com.caimei.modules.user.entity.CmOperationUser;
-import com.caimei.modules.user.entity.CmUser;
-import com.caimei.modules.user.entity.NewCmClub;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-/**
- * 快速咨询列表Service
- *
- * @author plf
- * @version 2020-04-22
- */
-@Service
-@Transactional(readOnly = true)
-public class CmAdvisoryService extends CrudService<CmAdvisoryDao, CmAdvisory> {
-    @Autowired
-    private CmAdvisoryDao cmAdvisoryDao;
-    @Autowired
-    private CmOperationUserDao cmOperationUserDao;
-    @Autowired
-    private NewCmClubDao newCmClubDao;
-
-    public CmAdvisory get(String id) {
-        return super.get(id);
-    }
-
-    public List<CmAdvisory> findList(CmAdvisory cmAdvisory) {
-        return super.findList(cmAdvisory);
-    }
-
-    public Page<CmAdvisory> findPage(Page<CmAdvisory> page, CmAdvisory cmAdvisory) {
-        Page<CmAdvisory> advisoryPage = super.findPage(page, cmAdvisory);
-        for (CmAdvisory advisory : advisoryPage.getList()) {
-            CmUser user = cmAdvisoryDao.findUser(advisory.getMobile());
-            if (null != user) {
-                advisory.setClubName(user.getName());
-                advisory.setClubContactPerson(true);
-            }
-            CmOperationUser cmOperationUser = new CmOperationUser();
-            cmOperationUser.setMobile(advisory.getMobile());
-            List<CmOperationUser> operationUsers = cmOperationUserDao.findListBuyBindMobile(cmOperationUser);
-            //判断是否是运营人员
-            if (null != operationUsers && operationUsers.size() > 0) {
-                NewCmClub club = newCmClubDao.getclubByUserId(Integer.valueOf(operationUsers.get(0).getUserID()));
-                advisory.setClubName(club.getName());
-                advisory.setOperationsStaff(true);
-            }
-        }
-        return advisoryPage;
-    }
-
-    @Transactional(readOnly = false)
-    public void save(CmAdvisory cmAdvisory) {
-        super.save(cmAdvisory);
-    }
-
-    @Transactional(readOnly = false)
-    public void delete(CmAdvisory cmAdvisory) {
-        super.delete(cmAdvisory);
-    }
-
-}

src/main/java/com/caimei/modules/advisory/web/CmAdvisoryController.java

@@ -1,79 +0,0 @@
-package com.caimei.modules.advisory.web;
-
-import com.caimei.modules.advisory.entity.CmAdvisory;
-import com.caimei.modules.advisory.service.CmAdvisoryService;
-import com.thinkgem.jeesite.common.config.Global;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.utils.StringUtils;
-import com.thinkgem.jeesite.common.web.BaseController;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * 快速咨询列表Controller
- * @author plf
- * @version 2020-04-22
- */
-@Controller
-@RequestMapping(value = "${adminPath}/advisory/cmAdvisory")
-public class CmAdvisoryController extends BaseController {
-
-	@Autowired
-	private CmAdvisoryService cmAdvisoryService;
-	
-	@ModelAttribute
-	public CmAdvisory get(@RequestParam(required=false) String id) {
-		CmAdvisory entity = null;
-		if (StringUtils.isNotBlank(id)){
-			entity = cmAdvisoryService.get(id);
-		}
-		if (entity == null){
-			entity = new CmAdvisory();
-		}
-		return entity;
-	}
-	
-	@RequiresPermissions("advisory:cmAdvisory:view")
-	@RequestMapping(value = {"list", ""})
-	public String list(CmAdvisory cmAdvisory, HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<CmAdvisory> page = cmAdvisoryService.findPage(new Page<CmAdvisory>(request, response), cmAdvisory); 
-		model.addAttribute("page", page);
-		return "modules/advisory/cmAdvisoryList";
-	}
-
-	@RequiresPermissions("advisory:cmAdvisory:view")
-	@RequestMapping(value = "form")
-	public String form(CmAdvisory cmAdvisory, Model model) {
-		model.addAttribute("cmAdvisory", cmAdvisory);
-		return "modules/advisory/cmAdvisoryForm";
-	}
-
-	@RequiresPermissions("advisory:cmAdvisory:edit")
-	@RequestMapping(value = "save")
-	public String save(CmAdvisory cmAdvisory, Model model, RedirectAttributes redirectAttributes) {
-		if (!beanValidator(model, cmAdvisory)){
-			return form(cmAdvisory, model);
-		}
-		cmAdvisoryService.save(cmAdvisory);
-		addMessage(redirectAttributes, "保存快速咨询列表成功");
-		return "redirect:"+Global.getAdminPath()+"/advisory/cmAdvisory/?repage";
-	}
-	
-	@RequiresPermissions("advisory:cmAdvisory:delete")
-	@RequestMapping(value = "delete")
-	public String delete(CmAdvisory cmAdvisory, RedirectAttributes redirectAttributes) {
-		cmAdvisoryService.delete(cmAdvisory);
-		addMessage(redirectAttributes, "删除快速咨询列表成功");
-		return "redirect:"+Global.getAdminPath()+"/advisory/cmAdvisory/?repage";
-	}
-
-}

src/main/java/com/caimei/modules/archive/service/CmProductArchiveContentService.java

@@ -16,7 +16,7 @@ import com.caimei.modules.archive.entity.CmProductArchiveFile;
 import com.caimei.modules.archive.utils.OssArchiveUtil;
 import com.caimei.modules.archive.utils.WaterMarkUtils;
 import com.caimei.modules.common.utils.UploadUtils;
-import com.caimei.modules.oss.utils.OSSUtils;
+import com.caimei.modules.order.utils.OSSUtils;
 import com.caimei.modules.sys.utils.UploadImageUtils;
 import com.thinkgem.jeesite.common.config.Global;
 import com.thinkgem.jeesite.common.utils.Encodes;

src/main/java/com/caimei/modules/baike/service/CmBaikeHotSearchService.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 import com.caimei.modules.baike.entity.CmBaikeBanner;
 import com.caimei.modules.common.utils.UploadUtils;
-import com.caimei.modules.miniprogram.utils.UploadPicUtils;
+import com.caimei.modules.hehe.util.UploadPicUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

src/main/java/com/caimei/modules/baike/service/CmBaikeProductService.java

@@ -9,9 +9,9 @@ import com.caimei.modules.archive.utils.OssArchiveUtil;
 import com.caimei.modules.baike.dao.CmBaikeProductRecommendDao;
 import com.caimei.modules.baike.entity.*;
 import com.caimei.modules.basesetting.dao.KeywordDao;
+import com.caimei.modules.hehe.util.UploadPicUtils;
 import com.caimei.modules.info.entity.Info;
-import com.caimei.modules.miniprogram.utils.UploadPicUtils;
-import com.caimei.modules.oss.utils.OSSUtils;
+import com.caimei.modules.order.utils.OSSUtils;
 import com.caimei.modules.utils.RequestUtil;
 import com.caimei.modules.utils.message.InsideMessage;
 import com.caimei.modules.utils.message.MessageModel;

src/main/java/com/caimei/modules/baike/web/CmBaikeProductController.java

@@ -13,7 +13,7 @@ import com.caimei.modules.baike.entity.*;
 import com.caimei.modules.baike.service.CmBaikeTypeService;
 import com.caimei.modules.info.dao.InfoDao;
 import com.caimei.modules.opensearch.GenerateUtils;
-import com.caimei.modules.oss.utils.OSSUtils;
+import com.caimei.modules.order.utils.OSSUtils;
 import com.caimei.modules.product.dao.KeywordFrequencyDao;
 import com.caimei.modules.product.entity.CmProductRecommend;
 import com.caimei.modules.product.entity.Product;

src/main/java/com/caimei/modules/baike/web/CmBaikeTypeController.java

@@ -5,7 +5,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.caimei.modules.baike.dao.CmBaikeTypeDao;
-import com.caimei.modules.miniprogram.utils.UploadPicUtils;
+import com.caimei.modules.hehe.util.UploadPicUtils;
 import com.caimei.modules.opensearch.GenerateUtils;
 import com.google.common.collect.Maps;
 import org.apache.shiro.authz.annotation.RequiresPermissions;

src/main/java/com/caimei/modules/banner/dao/CrmBannerDao.java

@@ -1,17 +0,0 @@
-package com.caimei.modules.banner.dao;
-
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.banner.entity.CrmBanner;
-
-/**
- * CRM首页轮播图DAO接口
- * @author LG
- * @version 2016-08-19
- */
-@MyBatisDao
-public interface CrmBannerDao extends CrudDao<CrmBanner> {
-
-	int countEnabledStatus(String status);
-	
-}

src/main/java/com/caimei/modules/banner/entity/CrmBanner.java

@@ -1,83 +0,0 @@
-package com.caimei.modules.banner.entity;
-
-import org.hibernate.validator.constraints.Length;
-import javax.validation.constraints.NotNull;
-
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-
-/**
- * CRM首页轮播图Entity
- * @author LG
- * @version 2016-08-19
- */
-public class CrmBanner extends DataEntity<CrmBanner> {
-	
-	private static final long serialVersionUID = 1L;
-	private String title;		// 标题
-	private String link;		// 链接
-	private String appLink;		//app链接
-	private String image;		// 图片
-	private Integer sort;		// 排序
-	private String enabledStatus;		// 状态 0停用 1启用
-	
-	public CrmBanner() {
-		super();
-	}
-
-	public CrmBanner(String id){
-		super(id);
-	}
-
-	@Length(min=1, max=40, message="标题长度必须介于 1 和 40 之间")
-	public String getTitle() {
-		return title;
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
-	
-	@Length(min=0, max=100, message="链接长度必须介于 0 和 100 之间")
-	public String getLink() {
-		return link;
-	}
-
-	public void setLink(String link) {
-		this.link = link;
-	}
-	
-	public String getAppLink() {
-		return appLink;
-	}
-
-	public void setAppLink(String appLink) {
-		this.appLink = appLink;
-	}
-
-	public String getImage() {
-		return image;
-	}
-
-	public void setImage(String image) {
-		this.image = image;
-	}
-	
-	@NotNull(message="排序不能为空")
-	public Integer getSort() {
-		return sort;
-	}
-
-	public void setSort(Integer sort) {
-		this.sort = sort;
-	}
-	
-	@Length(min=1, max=1, message="状态 0停用 1启用长度必须介于 1 和 1 之间")
-	public String getEnabledStatus() {
-		return enabledStatus;
-	}
-
-	public void setEnabledStatus(String enabledStatus) {
-		this.enabledStatus = enabledStatus;
-	}
-	
-}

src/main/java/com/caimei/modules/banner/service/CrmBannerService.java

@@ -1,77 +0,0 @@
-package com.caimei.modules.banner.service;
-
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import com.caimei.modules.sys.utils.UploadImageUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.thinkgem.jeesite.common.config.Global;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.thinkgem.jeesite.common.utils.Encodes;
-import com.thinkgem.jeesite.common.utils.StringUtils;
-import com.caimei.modules.banner.entity.CrmBanner;
-import com.caimei.modules.brand.utils.ImagePathUtils;
-import com.caimei.dfs.image.beens.ImageUploadInfo;
-import com.caimei.modules.banner.dao.CrmBannerDao;
-
-/**
- * CRM首页轮播图Service
- * @author LG
- * @version 2016-08-19
- */
-@Service
-@Transactional(readOnly = true)
-public class CrmBannerService extends CrudService<CrmBannerDao, CrmBanner> {
-	
-	@Autowired
-	private CrmBannerDao crmBannerDao;
-
-	public CrmBanner get(String id) {
-		return super.get(id);
-	}
-	
-	public List<CrmBanner> findList(CrmBanner crmBanner) {
-		return super.findList(crmBanner);
-	}
-	
-	public Page<CrmBanner> findPage(Page<CrmBanner> page, CrmBanner crmBanner) {
-		return super.findPage(page, crmBanner);
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(CrmBanner crmBanner, HttpServletRequest request) {
-		String image = crmBanner.getImage();
-		if(StringUtils.isNotBlank(image) && !image.startsWith("http://") && !image.startsWith("https://")){
-			String photoServer = Global.getConfig("photoServer");//获取文件服务器地址
-			image=Encodes.urlDecode(image);
-			String realPath = UploadImageUtils.getAbsolutePath(image);
-//			String realPath = request.getSession().getServletContext().getRealPath(image);
-//			realPath=Encodes.urlDecode(realPath);
-			int pointerIndex = realPath.lastIndexOf(".");
-			ImageUploadInfo saveImageSerivce=new ImageUploadInfo();
-			try {
-				logger.info("---------lijunp-hotoServer:"+photoServer+"---image:"+image+"---realPath:"+realPath);
-				saveImageSerivce = ImagePathUtils.saveImageSerivce(realPath, pointerIndex,realPath);
-				crmBanner.setImage(photoServer+saveImageSerivce.getSource());
-			} catch (Exception e) {
-				logger.error("图片上传错误:"+e.toString(),e);
-			}
-		}
-		super.save(crmBanner);
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(CrmBanner crmBanner) {
-		super.delete(crmBanner);
-	}
-
-	public int countEnabledStatus(String status) {
-		return crmBannerDao.countEnabledStatus(status);
-	}
-	
-}

src/main/java/com/caimei/modules/banner/web/CrmBannerController.java

@@ -1,159 +0,0 @@
-package com.caimei.modules.banner.web;
-
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.caimei.modules.banner.entity.CrmBanner;
-import com.caimei.modules.banner.service.CrmBannerService;
-import com.google.common.collect.Maps;
-import com.thinkgem.jeesite.common.config.Global;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.utils.StringUtils;
-import com.thinkgem.jeesite.common.web.BaseController;
-
-/**
- * CRM首页轮播图Controller
- * @author LG
- * @version 2016-08-19
- */
-@Controller
-@RequestMapping(value = "${adminPath}/banner/crmBanner")
-public class CrmBannerController extends BaseController {
-
-	@Autowired
-	private CrmBannerService crmBannerService;
-	
-	@ModelAttribute
-	public CrmBanner get(@RequestParam(required=false) String id) {
-		CrmBanner entity = null;
-		if (StringUtils.isNotBlank(id)){
-			entity = crmBannerService.get(id);
-		}
-		if (entity == null){
-			entity = new CrmBanner();
-		}
-		return entity;
-	}
-	
-	@RequiresPermissions("banner:crmBanner:view")
-	@RequestMapping(value = {"list", ""})
-	public String list(CrmBanner crmBanner, HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<CrmBanner> page = crmBannerService.findPage(new Page<CrmBanner>(request, response), crmBanner); 
-		model.addAttribute("page", page);
-		return "modules/banner/crmBannerList";
-	}
-
-	@RequiresPermissions("banner:crmBanner:view")
-	@RequestMapping(value = "form")
-	public String form(CrmBanner crmBanner, Model model) {
-		model.addAttribute("crmBanner", crmBanner);
-		return "modules/banner/crmBannerForm";
-	}
-
-	@RequiresPermissions("banner:crmBanner:edit")
-	@RequestMapping(value = "save")
-	public String save(CrmBanner crmBanner, Model model, RedirectAttributes redirectAttributes, HttpServletRequest request) {
-		if(checkValidator(model, crmBanner)){//参数、必填验证
-			return form(crmBanner, model);
-		}
-		crmBannerService.save(crmBanner,request);
-		addMessage(redirectAttributes, "保存CRM首页轮播图成功");
-		return "redirect:"+Global.getAdminPath()+"/banner/crmBanner/?repage";
-	}
-	
-	private boolean checkValidator(Model model,CrmBanner crmBanner) {
-		if (!beanValidator(model, crmBanner)){
-			return true;
-		}
-		if(StringUtils.getStringLength(crmBanner.getTitle())>40){
-			model.addAttribute("message", "标题过长！");
-			return true;
-		}
-		if(StringUtils.isNotBlank(crmBanner.getLink()) &&StringUtils.getStringLength(crmBanner.getTitle())>100){
-			model.addAttribute("message", "链接过长！");
-			return true;
-		}
-		if(StringUtils.equals(crmBanner.getEnabledStatus(), "1")){
-			CrmBanner crmBanner2 = crmBannerService.get(crmBanner.getId());
-			if(null!=crmBanner2){
-				if(!StringUtils.equals(crmBanner2.getEnabledStatus(), "1") && crmBannerService.countEnabledStatus("1")>=9){
-					model.addAttribute("message", "最多只能启用9项，请先停用！");
-					return true;
-				}
-			}else if(crmBannerService.countEnabledStatus("1")>=9){
-				model.addAttribute("message", "最多只能启用9项，请先停用！");
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	@RequiresPermissions("banner:crmBanner:delete")
-	@RequestMapping(value = "delete")
-	public String delete(CrmBanner crmBanner, RedirectAttributes redirectAttributes) {
-		crmBannerService.delete(crmBanner);
-		addMessage(redirectAttributes, "删除CRM首页轮播图成功");
-		return "redirect:"+Global.getAdminPath()+"/banner/crmBanner/?repage";
-	}
-	
-	/**
-	 * 批量修改启用、停用状态
-	 * @param enabledStatus
-	 * @param ids
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	@RequiresPermissions("banner:crmBanner:edit")
-	@ResponseBody
-	@RequestMapping(value="updateEnabledStatus")
-	public Map<String, Object> updateEnabledStatus(String status,String[] ids,HttpServletRequest request,HttpServletResponse response){
-		Map<String, Object> map =Maps.newLinkedHashMap();
-		try {
-			crmBannerService.updateEnabledStatusByIds(status,ids);
-			map.put("success",true);
-			map.put("msg", "修改成功");
-		} catch (Exception e) {
-			logger.debug(e.toString(),e);
-			map.put("success",false);
-			map.put("msg", "修改失败");
-		}
-        return map;  
-	}
-
-	/**
-	 * 状态统计
-	 * @param enabledStatus
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	@RequiresPermissions("banner:crmBanner:view")
-	@ResponseBody
-	@RequestMapping(value="countEnabledStatus")
-	public Map<String, Object> countEnabledStatus(String status,HttpServletRequest request,HttpServletResponse response){
-		Map<String, Object> map =Maps.newLinkedHashMap();
-		try {
-			int count=crmBannerService.countEnabledStatus(status);
-			map.put("success",true);
-			map.put("count",count);
-		} catch (Exception e) {
-			logger.debug(e.toString(),e);
-			map.put("success",false);
-			map.put("count",0);
-		}
-        return map;  
-	}
-}

src/main/java/com/caimei/modules/basesetting/dao/HelpPageDao.java

@@ -15,6 +15,7 @@ import java.util.List;
  */
 @MyBatisDao
 public interface HelpPageDao extends CrudDao<Helppage> {
+
     List<BaseType> findHelpPageType();
 
     List<Helppage> findHelppageList(Helppage helppage);

src/main/java/com/caimei/modules/brand/dao/BrandAgentDao.java

@@ -1,26 +0,0 @@
-package com.caimei.modules.brand.dao;
-
-import java.util.Map;
-
-import com.caimei.modules.brand.entity.BrandAgent;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-
-/**
- * 品牌联盟代理商DAO接口
- * @author LG
- * @version 2016-05-13
- */
-@MyBatisDao
-public interface BrandAgentDao extends CrudDao<BrandAgent> {
-
-	/**
-	 * <p>Description: 更新启用/停用状态</p>
-	 * <p>Company: caimei365</p> 
-	 * @author dmeng
-	 * @date 2016年5月17日 下午5:32:03
-	 * @param param
-	 */
-	void changeStatus(Map<String, Object> param);
-	
-}

src/main/java/com/caimei/modules/brand/dao/BrandIdentificationCodeDao.java

@@ -1,33 +0,0 @@
-package com.caimei.modules.brand.dao;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.caimei.modules.brand.entity.BrandIdentificationCode;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-
-/**
- * 品牌联盟代理商DAO接口
- * @author LG
- * @version 2016-05-13
- */
-@MyBatisDao
-public interface BrandIdentificationCodeDao extends CrudDao<BrandIdentificationCode> {
-
-	/**
-	 * 
-	 * <p>Description: 获取一个未使用的商品标识码</p>
-	 * <p>Company: caimei365</p> 
-	 * @author dmeng
-	 * @date 2016年5月20日 上午11:51:07
-	 * @return
-	 */
-	BrandIdentificationCode getIdentificationCode();
-	
-	Long getUnusedNum();
-	
-	int useCode(BrandIdentificationCode brandIdentificationCode);
-	
-	BrandIdentificationCode getByCode(@Param("code") String code);
-	
-}

src/main/java/com/caimei/modules/brand/dao/BrandProductDao.java

@@ -1,33 +0,0 @@
-package com.caimei.modules.brand.dao;
-
-import java.util.Map;
-
-import com.caimei.modules.brand.entity.BrandProduct;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-
-/**
- * 品牌联盟商品DAO接口
- * @author LG
- * @version 2016-05-13
- */
-@MyBatisDao
-public interface BrandProductDao extends CrudDao<BrandProduct> {
-	
-	/**
-	 * <p>Description: 更新启用/停用状态</p>
-	 * <p>Company: caimei365</p> 
-	 * @author dmeng
-	 * @date 2016年5月17日 下午5:32:03
-	 * @param param
-	 */
-	void changeStatus(Map<String, Object> param);
-
-	/**
-	 * 批量修改状态
-	 * @param enabledStatus
-	 * @param ids
-	 */
-	int updateEnabledStatusByIds(String enabledStatus, String[] ids);
-	
-}

src/main/java/com/caimei/modules/brand/dao/BrandProductsDao.java

@@ -1,21 +0,0 @@
-package com.caimei.modules.brand.dao;
-
-import java.util.List;
-
-import com.caimei.modules.brand.entity.BrandProducts;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-
-/**
- * 商品管理DAO接口
- * @author LG
- * @version 2016-08-24
- */
-@MyBatisDao
-public interface BrandProductsDao extends CrudDao<BrandProducts> {
-
-	List<BrandProducts> findBySn(String sn);
-
-	List<BrandProducts> findByIdentificationCode(String identificationCode);
-	
-}

src/main/java/com/caimei/modules/brand/dao/BrandPurchaserDao.java

@@ -1,26 +0,0 @@
-package com.caimei.modules.brand.dao;
-
-import java.util.Map;
-
-import com.caimei.modules.brand.entity.BrandPurchaser;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-
-/**
- * 品牌联盟购买者DAO接口
- * @author LG
- * @version 2016-05-13
- */
-@MyBatisDao
-public interface BrandPurchaserDao extends CrudDao<BrandPurchaser> {
-	
-	/**
-	 * <p>Description: 更新启用/停用状态</p>
-	 * <p>Company: caimei365</p> 
-	 * @author dmeng
-	 * @date 2016年5月17日 下午5:32:03
-	 * @param param
-	 */
-	void changeStatus(Map<String, Object> param);
-	
-}

src/main/java/com/caimei/modules/brand/dao/BrandSupplierDao.java

@@ -1,26 +0,0 @@
-package com.caimei.modules.brand.dao;
-
-import java.util.Map;
-
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.brand.entity.BrandSupplier;
-
-/**
- * 品牌供应商DAO接口
- * @author LG
- * @version 2016-05-13
- */
-@MyBatisDao
-public interface BrandSupplierDao extends CrudDao<BrandSupplier> {
-	
-	/**
-	 * <p>Description: 更新启用/停用状态</p>
-	 * <p>Company: caimei365</p> 
-	 * @author dmeng
-	 * @date 2016年5月17日 下午5:32:03
-	 * @param param
-	 */
-	void changeStatus(Map<String, Object> param);
-
-}

src/main/java/com/caimei/modules/brand/dao/CmBrandDao.java

@@ -8,12 +8,14 @@ import java.util.List;
 
 /**
  * 采美品牌DAO接口
+ *
  * @author Lijun
  * @version 2019-04-19
  */
 @MyBatisDao
 public interface CmBrandDao extends CrudDao<CmBrand> {
-    CmBrand findBradByName(CmBrand cmBrand) ;
+
+    CmBrand findBradByName(CmBrand cmBrand);
 
     List<CmBrand> getList();
 }

src/main/java/com/caimei/modules/brand/dao/ProductModelDao.java

@@ -1,10 +0,0 @@
-package com.caimei.modules.brand.dao;
-
-import com.caimei.modules.brand.model.ProductModel;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-
-@MyBatisDao
-public interface ProductModelDao extends CrudDao<ProductModel> {
-
-}

src/main/java/com/caimei/modules/brand/dao/ShopModelDao.java

@@ -1,10 +0,0 @@
-package com.caimei.modules.brand.dao;
-
-import com.caimei.modules.brand.model.ShopModel;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-
-@MyBatisDao
-public interface ShopModelDao extends CrudDao<ShopModel> {
-
-}

src/main/java/com/caimei/modules/brand/service/BrandAgentService.java

@@ -1,58 +0,0 @@
-package com.caimei.modules.brand.service;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.caimei.modules.brand.dao.BrandAgentDao;
-import com.caimei.modules.brand.entity.BrandAgent;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-
-/**
- * 品牌联盟代理商Service
- * @author LG
- * @version 2016-05-13
- */
-@Service
-@Transactional(readOnly = true)
-public class BrandAgentService extends CrudService<BrandAgentDao, BrandAgent> {
-
-	@Autowired
-	private BrandAgentDao brandAgentDao;
-	
-	public BrandAgent get(String id) {
-		return super.get(id);
-	}
-	
-	public List<BrandAgent> findList(BrandAgent brandAgent) {
-		return super.findList(brandAgent);
-	}
-	
-	public Page<BrandAgent> findPage(Page<BrandAgent> page, BrandAgent brandAgent) {
-		return super.findPage(page, brandAgent);
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(BrandAgent brandAgent) {
-		super.save(brandAgent);
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(BrandAgent brandAgent) {
-		super.delete(brandAgent);
-	}
-	
-	@Transactional(readOnly = false)
-	public void changeStatus(BrandAgent brandAgent) {
-		Map<String, Object> param = new HashMap<String, Object>();
-		param.put("id", brandAgent.getId());
-		param.put("enabledStatus", brandAgent.getEnabledStatus());
-		brandAgentDao.changeStatus(param);
-	}
-	
-}

src/main/java/com/caimei/modules/brand/service/BrandIdentificationCodeService.java

@@ -1,93 +0,0 @@
-package com.caimei.modules.brand.service;
-
-import java.util.Date;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.caimei.modules.brand.dao.BrandIdentificationCodeDao;
-import com.caimei.modules.brand.entity.BrandIdentificationCode;
-import com.caimei.utils.RandomStringUtil;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-
-/**
- * 商品标识码Service
- * @author demon
- * @version 2016-05-20
- */
-@Service
-@Transactional(readOnly = true)
-public class BrandIdentificationCodeService extends CrudService<BrandIdentificationCodeDao, BrandIdentificationCode> {
-
-	@Autowired
-	private BrandIdentificationCodeDao brandIdentificationCodeDao;
-	
-	public BrandIdentificationCode get(String id) {
-		return super.get(id);
-	}
-	
-	public List<BrandIdentificationCode> findList(BrandIdentificationCode brandIndentificationCode) {
-		return super.findList(brandIndentificationCode);
-	}
-	
-	public Page<BrandIdentificationCode> findPage(Page<BrandIdentificationCode> page, BrandIdentificationCode brandIndentificationCode) {
-		return super.findPage(page, brandIndentificationCode);
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(BrandIdentificationCode brandIndentificationCode) {
-		super.save(brandIndentificationCode);
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(BrandIdentificationCode brandIndentificationCode) {
-		super.delete(brandIndentificationCode);
-	}
-	
-	/**
-	 * <p>Description: 获取一个未使用的标识码</p>
-	 * <p>Company: caimei365</p> 
-	 * @author dmeng
-	 * @date 2016年5月20日 下午2:12:23
-	 * @return 如果已用完会重新插入一个并返回
-	 */
-	@Transactional(readOnly = false)
-	public BrandIdentificationCode getOne() {
-		BrandIdentificationCode idCode = brandIdentificationCodeDao.getIdentificationCode();
-		if(idCode == null) {
-			idCode = new BrandIdentificationCode();
-			idCode.setIdentificationCode(RandomStringUtil.getRandomString());
-			idCode.setCreateTime(new Date());
-			brandIdentificationCodeDao.insert(idCode);
-		}
-		return idCode;
-	}
-	
-	/**
-	 * <p>Description: 生成标识码</p>
-	 * <p>Company: caimei365</p> 
-	 * @author dmeng
-	 * @date 2016年5月20日 下午3:42:18
-	 * @param genCount 生成数量
-	 */
-	@Transactional(readOnly = false)
-	public void generate(Integer genCount) {
-		if(genCount != null && genCount > 0) {
-			for(int i=0; i<genCount; i++) {
-				BrandIdentificationCode idCode = new BrandIdentificationCode();
-				idCode.setIdentificationCode(RandomStringUtil.getRandomString());
-				idCode.setCreateTime(new Date());
-				brandIdentificationCodeDao.insert(idCode);
-			}
-		}
-	}
-	
-	@Transactional(readOnly = false)
-	public Long getUnusedNum() {
-		return this.brandIdentificationCodeDao.getUnusedNum();
-	}
-	
-}

src/main/java/com/caimei/modules/brand/service/BrandProductService.java

@@ -1,264 +0,0 @@
-package com.caimei.modules.brand.service;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-
-import javax.servlet.http.HttpServletRequest;
-
-import com.caimei.modules.sys.utils.UploadImageUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.caimei.dfs.image.beens.ImageUploadInfo;
-import com.caimei.modules.brand.dao.BrandAgentDao;
-import com.caimei.modules.brand.dao.BrandIdentificationCodeDao;
-import com.caimei.modules.brand.dao.BrandProductDao;
-import com.caimei.modules.brand.dao.BrandPurchaserDao;
-import com.caimei.modules.brand.dao.BrandSupplierDao;
-import com.caimei.modules.brand.entity.BrandAgent;
-import com.caimei.modules.brand.entity.BrandIdentificationCode;
-import com.caimei.modules.brand.entity.BrandProduct;
-import com.caimei.modules.brand.entity.BrandPurchaser;
-import com.caimei.modules.brand.entity.BrandSupplier;
-import com.caimei.modules.brand.utils.ImagePathUtils;
-import com.caimei.utils.DateUtils;
-import com.caimei.utils.Encodes;
-import com.caimei.utils.RandomStringUtil;
-import com.caimei.utils.StringUtils;
-import com.google.common.collect.Lists;
-import com.thinkgem.jeesite.common.config.Global;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.thinkgem.jeesite.common.utils.FileUtils;
-
-/**
- * 品牌联盟商品Service
- * @author LG
- * @version 2016-05-13
- */
-@Service
-@Transactional(readOnly = true)
-public class BrandProductService extends CrudService<BrandProductDao, BrandProduct> {
-
-	Object obj = new Object();
-	
-	@Autowired
-	private BrandAgentDao brandAgentDao;
-	
-	@Autowired
-	private BrandPurchaserDao brandPurchaserDao;
-	
-	@Autowired
-	private BrandSupplierDao brandSupplierDao;
-	
-	@Autowired
-	private BrandProductDao brandProductDao;
-	@Autowired
-	private BrandIdentificationCodeDao brandIdentificationCodeDao;
-	
-	public BrandProduct get(String id) {
-		BrandProduct brandProduct = super.get(id);
-		
-		if(null!=brandProduct.getBrandAgent()&&StringUtils.isNotBlank(brandProduct.getBrandAgent().getId()))
-		brandProduct.setBrandAgent(brandAgentDao.get(brandProduct.getBrandAgent().getId()));
-		
-		if(null!=brandProduct.getBrandPurchaser()&&StringUtils.isNotBlank(brandProduct.getBrandPurchaser().getId()))
-		brandProduct.setBrandPurchaser(brandPurchaserDao.get(brandProduct.getBrandPurchaser().getId()));
-		
-		if(null!=brandProduct.getBrandSupplier()&&StringUtils.isNotBlank(brandProduct.getBrandSupplier().getId()))
-		brandProduct.setBrandSupplier(brandSupplierDao.get(brandProduct.getBrandSupplier().getId()));
-		
-		return brandProduct;
-	}
-	
-	public List<BrandProduct> findList(BrandProduct brandProduct) {
-		return super.findList(brandProduct);
-	}
-	
-	public Page<BrandProduct> findPage(Page<BrandProduct> page, BrandProduct brandProduct) {
-		return super.findPage(page, brandProduct);
-	}
-	
-	@Transactional(readOnly = false)
-	public String save(BrandProduct brandProduct, HttpServletRequest request){
-		String message="";
-		//供应商
-		BrandSupplier brandSupplier = brandProduct.getBrandSupplier();
-		if(StringUtils.isBlank(brandSupplier.getId())){
-			//LOGO
-			String LOGO=brandSupplier.getLOGO();
-			if(StringUtils.isNotBlank(LOGO)){
-				LOGO=Encodes.urlDecode(LOGO);
-//				String realPath = request.getSession().getServletContext().getRealPath(LOGO);
-                String realPath = UploadImageUtils.getAbsolutePath(LOGO);
-//				realPath=Encodes.urlDecode(realPath);
-				int pointerIndex = realPath.lastIndexOf(".");
-				ImageUploadInfo saveImageSerivce=new ImageUploadInfo();
-				String photoServer = Global.getConfig("photoServer");
-				try {
-					saveImageSerivce = ImagePathUtils.saveImageSerivce(realPath, pointerIndex,realPath);
-					brandSupplier.setLOGO(photoServer+saveImageSerivce.getSource());
-				} catch (Exception e) {
-					logger.error("LOGO图片上传错误:"+e.toString(),e);
-					message+="LOGO图片上传错误.";
-				}
-			}
-			brandSupplier.preInsert();
-			brandSupplierDao.insert(brandSupplier);
-		}
-		
-		String message1 = saveAgentAndProduct(brandProduct, request);
-		return message+message1;
-	}
-	
-	@Transactional(readOnly = false)
-	public void sameProductSave(BrandProduct brandProduct, HttpServletRequest request) {
-		saveAgentAndProduct(brandProduct, request);
-	}
-
-	private String saveAgentAndProduct(BrandProduct brandProduct, HttpServletRequest request){
-		String message="";
-		//代理商
-		BrandAgent brandAgent = brandProduct.getBrandAgent();
-		if(null!=brandAgent && StringUtils.isBlank(brandAgent.getId())){
-			if(StringUtils.isNotBlank(brandAgent.getName())){
-				brandAgent.preInsert();
-				brandAgentDao.insert(brandAgent);
-			}else{
-				brandProduct.setBrandAgent(new BrandAgent());
-			}
-		}
-
-		//购买者
-		BrandPurchaser brandPurchaser = brandProduct.getBrandPurchaser();
-		if(null!=brandPurchaser && StringUtils.isBlank(brandPurchaser.getId())){
-			//宣传资料
-			// 1000x1000 水印蒙板
-			String maskTemplates = FileUtils.class.getClassLoader().getResource("templates/images/1000_1000.png").getPath();
-			String[] iamgeArray = StringUtils.split(brandPurchaser.getPublictyMaterialImages(),"|");
-			List<String> imagesList=Lists.newArrayList();
-			List<String> largeImageList=Lists.newArrayList();
-			if(StringUtils.isNotBlank(brandPurchaser.getPublictyMaterialImages())){
-				try {
-					ImagePathUtils.getImagesPath(request, maskTemplates, iamgeArray, imagesList, largeImageList);
-					brandPurchaser.setPublictyMaterialImages(StringUtils.join(imagesList, "|"));
-					brandPurchaser.setLargeImages(StringUtils.join(largeImageList, "|"));
-				} catch (Exception e) {
-					logger.error("购买者图片上传错误:"+e.toString(),e);
-					message+="购买者 宣传资料图片上传失败.";
-				}
-			}
-			if(StringUtils.isNotBlank(brandPurchaser.getName())){
-				brandPurchaser.preInsert();
-				brandPurchaserDao.insert(brandPurchaser);
-			}else{
-				brandProduct.setBrandPurchaser(new BrandPurchaser());
-			}
-		}
-		//档案编号
-		if(StringUtils.isBlank(brandProduct.getFileNumber())){
-			brandProduct.setFileNumber(createNo(DateUtils.formatDate(brandProduct.getLicenseStartDate(),"yyyyMMdd")));
-		}
-		
-		//商品图片
-		// 1000x1000 水印蒙板
-		String maskTemplates = FileUtils.class.getClassLoader().getResource("templates/images/1000_1000.png").getPath();
-		String[] iamgeArray = StringUtils.split(brandProduct.getImages(),"|");
-		List<String> imagesList=Lists.newArrayList();
-		List<String> largeImageList=Lists.newArrayList();
-		if(StringUtils.isNotBlank(brandProduct.getImages())) {
-			try {
-				ImagePathUtils.getImagesPath(request, maskTemplates, iamgeArray, imagesList, largeImageList);
-				brandProduct.setImages(StringUtils.join(imagesList, "|"));
-				brandProduct.setLargeImages(StringUtils.join(largeImageList, "|"));
-			} catch (Exception e) {
-				logger.error("商品图片上传错误:"+e.toString(),e);
-				message+="商品图片上传失败.";
-			}
-		}
-		//参数图片
-		// 1000_562 水印蒙板
-		maskTemplates = FileUtils.class.getClassLoader().getResource("templates/images/1000_562.png").getPath();
-		iamgeArray = StringUtils.split(brandProduct.getParameterImages(),"|");
-		imagesList=Lists.newArrayList();
-		largeImageList=Lists.newArrayList();
-		if(StringUtils.isNotBlank(brandProduct.getParameterImages())){
-			try {
-				ImagePathUtils.getImagesPath(request, maskTemplates, iamgeArray, imagesList, largeImageList);
-				brandProduct.setParameterImages(StringUtils.join(imagesList, "|"));
-				brandProduct.setParameterLargeImages(StringUtils.join(largeImageList, "|"));
-			} catch (Exception e) {
-				logger.error("参数图片上传错误:"+e.toString(),e);
-				message+="参数图片上传失败.";
-			}
-		}
-		synchronized(obj) {
-			//标识码
-			BrandIdentificationCode idCode = null;
-			boolean useCode = false;
-			if(StringUtils.isBlank(brandProduct.getId())){
-				idCode = brandIdentificationCodeDao.getIdentificationCode();
-				if(idCode == null) {
-					idCode = new BrandIdentificationCode();
-					idCode.setIdentificationCode(RandomStringUtil.getRandomString());
-					idCode.setCreateTime(new Date());
-					brandIdentificationCodeDao.insert(idCode);
-				}
-				brandProduct.setIdentificationCode(idCode.getIdentificationCode());
-				useCode = true;
-			}
-		
-			super.save(brandProduct);
-			
-			if(useCode){
-				// 标识码置为已使用
-				BrandIdentificationCode code = new BrandIdentificationCode();
-				code.setId(idCode.getId());
-				code.setBrandProductID(Integer.parseInt(brandProduct.getId()));
-				brandIdentificationCodeDao.useCode(code);
-			}
-		}
-		return message;
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(BrandProduct brandProduct) {
-		super.delete(brandProduct);
-	}
-	
-	/*
-	 * 生成档案编号
-	 */
-	private String createNo(String date) {
-		Random random = new Random();
-		String[] abcDic = {"A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","X"};
-		String no = "";
-		for(int i = 0; i < 2; i++) {
-			int ran = random.nextInt(abcDic.length);
-			no += abcDic[ran];
-		}
-		no += date;
-		no += System.currentTimeMillis();
-		no += random.nextInt(10);
-		return no;
-	}
-	
-
-	@Transactional(readOnly = false)
-	public void changeStatus(BrandProduct brandProduct) {
-		Map<String, Object> param = new HashMap<String, Object>();
-		param.put("id", brandProduct.getId());
-		param.put("enabledStatus", brandProduct.getEnabledStatus());
-		brandProductDao.changeStatus(param);
-	}
-	
-	@Transactional(readOnly = false)
-	public void updateEnabledStatusByIds(String enabledStatus, String[] ids) {
-		brandProductDao.updateEnabledStatusByIds(enabledStatus,ids);
-	}
-	
-}

src/main/java/com/caimei/modules/brand/service/BrandProductsService.java

@@ -1,179 +0,0 @@
-package com.caimei.modules.brand.service;
-
-import java.util.Date;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.caimei.modules.brand.dao.BrandIdentificationCodeDao;
-import com.caimei.modules.brand.dao.BrandProductsDao;
-import com.caimei.modules.brand.entity.BrandIdentificationCode;
-import com.caimei.modules.brand.entity.BrandProducts;
-import com.caimei.modules.brand.utils.ImagePathUtils;
-import com.caimei.utils.RandomStringUtil;
-import com.caimei.utils.StringUtils;
-import com.google.common.collect.Lists;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.thinkgem.jeesite.common.utils.FileUtils;
-
-/**
- * 商品管理Service
- * @author LG
- * @version 2016-08-24
- */
-@Service
-@Transactional(readOnly = true)
-public class BrandProductsService extends CrudService<BrandProductsDao, BrandProducts> {
-	
-	@Autowired
-	private BrandProductsDao brandProductsDao;
-
-	@Autowired
-	private BrandIdentificationCodeDao brandIdentificationCodeDao;
-	
-	Object obj = new Object();
-	
-	public BrandProducts get(String id) {
-		return super.get(id);
-	}
-	
-	public List<BrandProducts> findList(BrandProducts brandProducts) {
-		return super.findList(brandProducts);
-	}
-	
-	public Page<BrandProducts> findPage(Page<BrandProducts> page, BrandProducts brandProducts) {
-		return super.findPage(page, brandProducts);
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(BrandProducts brandProducts,HttpServletRequest request) throws Exception {
-		//商品图片
-		// 1000x1000 水印蒙板
-		String maskTemplates = FileUtils.class.getClassLoader().getResource("templates/images/1000_1000.png").getPath();
-		String[] iamgeArray = StringUtils.split(brandProducts.getImages(),"|");
-		List<String> imagesList=Lists.newArrayList();
-		List<String> largeImageList=Lists.newArrayList();
-		if(StringUtils.isNotBlank(brandProducts.getImages())) {
-			try {
-				ImagePathUtils.getImagesPath(request, maskTemplates, iamgeArray, imagesList, largeImageList);
-				brandProducts.setImages(StringUtils.join(imagesList, "|"));
-				brandProducts.setLargeImages(StringUtils.join(largeImageList, "|"));
-			} catch (Exception e) {
-				logger.error("商品图片上传错误:"+e.toString(),e);
-			}
-		}
-		//参数图片
-		// 1000_562 水印蒙板
-		if(StringUtils.isNotBlank(brandProducts.getParameterImages())){
-		maskTemplates = FileUtils.class.getClassLoader().getResource("templates/images/1000_562.png").getPath();
-		iamgeArray = StringUtils.split(brandProducts.getParameterImages(),"|");
-		imagesList=Lists.newArrayList();
-		largeImageList=Lists.newArrayList();
-			try {
-				ImagePathUtils.getImagesPath(request, maskTemplates, iamgeArray, imagesList, largeImageList);
-				brandProducts.setParameterImages(StringUtils.join(imagesList, "|"));
-				brandProducts.setParameterLargeImages(StringUtils.join(largeImageList, "|"));
-			} catch (Exception e) {
-				logger.error("参数图片上传错误:"+e.toString(),e);
-			}
-		}
-		
-		synchronized(obj) {
-			//标识码
-			BrandIdentificationCode idCode = null;
-			boolean useCode = false;
-			if(StringUtils.isBlank(brandProducts.getId())){ //新增商品
-				if(StringUtils.isBlank(brandProducts.getIdentificationCode())){//若没填写商品标志码
-					// 没有填写先不分配标识码
-					/*idCode = brandIdentificationCodeDao.getIdentificationCode();
-					if(idCode == null) {
-						idCode = new BrandIdentificationCode();
-						idCode.setIdentificationCode(RandomStringUtil.getRandomString());
-						idCode.setCreateTime(new Date());
-						brandIdentificationCodeDao.insert(idCode);
-					}
-					brandProducts.setIdentificationCode(idCode.getIdentificationCode());
-					useCode = true;*/
-				}else{
-					/*List<BrandProducts> list = brandProductsDao.findByIdentificationCode(brandProducts.getIdentificationCode());
-					if(CollectionUtils.isEmpty(list)){
-						idCode = new BrandIdentificationCode();
-						idCode.setIdentificationCode(brandProducts.getIdentificationCode());
-						idCode.setCreateTime(new Date());
-						brandIdentificationCodeDao.insert(idCode);
-						useCode = true;
-					}else{
-						throw new Exception("商品标志码已存在！");
-					}*/
-					idCode = brandIdentificationCodeDao.getByCode(brandProducts.getIdentificationCode());
-					if(idCode == null) {
-						throw new Exception("商品标志码不存在！");
-					} else if(idCode.getBrandProductID() != null) {
-						throw new Exception("商品标志码已使用！");
-					}
-					useCode = true;
-				}
-			}else{//修改
-				BrandProducts db = brandProductsDao.get(brandProducts.getId());
-				if(!StringUtils.equals(db.getIdentificationCode(), brandProducts.getIdentificationCode())){
-					/*******置空以前的IdentificationCode商品ID***********/
-					idCode = new BrandIdentificationCode();
-					idCode.setIdentificationCode(db.getIdentificationCode());
-					List<BrandIdentificationCode> findList = brandIdentificationCodeDao.findList(idCode);
-					idCode=findList.get(0);
-					brandIdentificationCodeDao.delete(idCode);
-					/******************/
-					/*List<BrandProducts> list = brandProductsDao.findByIdentificationCode(brandProducts.getIdentificationCode());
-					if(CollectionUtils.isEmpty(list)){
-						idCode = new BrandIdentificationCode();
-						idCode.setIdentificationCode(brandProducts.getIdentificationCode());
-						idCode.setCreateTime(new Date());
-						brandIdentificationCodeDao.insert(idCode);
-						useCode = true;
-					}else{
-						throw new Exception("商品标志码已存在！");
-					}*/
-					idCode = brandIdentificationCodeDao.getByCode(brandProducts.getIdentificationCode());
-					if(idCode == null) {
-						throw new Exception("商品标志码不存在！");
-					} else if(idCode.getBrandProductID() != null) {
-						throw new Exception("商品标志码已使用！");
-					}
-					useCode = true;
-				}
-			}
-		
-			super.save(brandProducts);
-			
-			if(useCode){
-				// 标识码置为已使用
-				BrandIdentificationCode code = new BrandIdentificationCode();
-				code.setId(idCode.getId());
-				code.setBrandProductID(Integer.parseInt(brandProducts.getId()));
-				brandIdentificationCodeDao.useCode(code);
-			}
-		}
-		
-		//super.save(brandProducts);
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(BrandProducts brandProducts) {
-		super.delete(brandProducts);
-	}
-
-	public List<BrandProducts> findBySn(String sn) {
-		return brandProductsDao.findBySn(sn);
-	}
-
-	public List<BrandProducts> findByIdentificationCode(String identificationCode) {
-		return brandProductsDao.findByIdentificationCode(identificationCode);
-	}
-	
-}

src/main/java/com/caimei/modules/brand/service/BrandPurchaserService.java

@@ -1,78 +0,0 @@
-package com.caimei.modules.brand.service;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.caimei.modules.brand.dao.BrandPurchaserDao;
-import com.caimei.modules.brand.entity.BrandPurchaser;
-import com.caimei.modules.brand.utils.ImagePathUtils;
-import com.caimei.utils.StringUtils;
-import com.google.common.collect.Lists;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.thinkgem.jeesite.common.utils.FileUtils;
-
-/**
- * 品牌联盟购买者Service
- * @author LG
- * @version 2016-05-13
- */
-@Service
-@Transactional(readOnly = true)
-public class BrandPurchaserService extends CrudService<BrandPurchaserDao, BrandPurchaser> {
-
-	@Autowired
-	private BrandPurchaserDao brandPurchaserDao;
-	
-	public BrandPurchaser get(String id) {
-		return super.get(id);
-	}
-	
-	public List<BrandPurchaser> findList(BrandPurchaser brandPurchaser) {
-		return super.findList(brandPurchaser);
-	}
-	
-	public Page<BrandPurchaser> findPage(Page<BrandPurchaser> page, BrandPurchaser brandPurchaser) {
-		return super.findPage(page, brandPurchaser);
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(BrandPurchaser brandPurchaser, HttpServletRequest request) {
-		// TODO 判断是否需要打水印 start with http ?
-		// 宣传资料
-		// 1000x1000 水印蒙板
-		String maskTemplates = FileUtils.class.getClassLoader().getResource("templates/images/1000_1000.png").getPath();
-		String[] imageArray = StringUtils.split(brandPurchaser.getPublictyMaterialImages(),"|");
-		List<String> imagesList=Lists.newArrayList();
-		List<String> largeImageList=Lists.newArrayList();
-		if(StringUtils.isNotBlank(brandPurchaser.getPublictyMaterialImages())){
-			ImagePathUtils.getImagesPath(request, maskTemplates, imageArray, imagesList, largeImageList);
-			brandPurchaser.setPublictyMaterialImages(StringUtils.join(imagesList, "|"));
-			brandPurchaser.setLargeImages(StringUtils.join(largeImageList, "|"));
-
-		}
-		
-		super.save(brandPurchaser);
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(BrandPurchaser brandPurchaser) {
-		super.delete(brandPurchaser);
-	}
-	
-	@Transactional(readOnly = false)
-	public void changeStatus(BrandPurchaser brandPurchaser) {
-		Map<String, Object> param = new HashMap<String, Object>();
-		param.put("id", brandPurchaser.getId());
-		param.put("enabledStatus", brandPurchaser.getEnabledStatus());
-		brandPurchaserDao.changeStatus(param);
-	}
-	
-}

src/main/java/com/caimei/modules/brand/service/BrandSupplierService.java

@@ -1,84 +0,0 @@
-package com.caimei.modules.brand.service;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.caimei.modules.brand.dao.BrandProductDao;
-import com.caimei.modules.brand.dao.BrandSupplierDao;
-import com.caimei.modules.brand.entity.BrandSupplier;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.thinkgem.jeesite.common.utils.StringUtils;
-
-/**
- * 品牌供应商Service
- * @author LG
- * @version 2016-05-13
- */
-@Service
-@Transactional(readOnly = true)
-public class BrandSupplierService extends CrudService<BrandSupplierDao, BrandSupplier> {
-
-	@Autowired
-	private BrandSupplierDao brandSupplierDao;
-	
-	@Autowired
-	private BrandProductDao brandProductDao;
-	
-	
-	public BrandSupplier get(String id) {
-		return super.get(id);
-	}
-	
-	public List<BrandSupplier> findList(BrandSupplier brandSupplier) {
-		return super.findList(brandSupplier);
-	}
-	
-	public Page<BrandSupplier> findPage(Page<BrandSupplier> page, BrandSupplier brandSupplier) {
-		return super.findPage(page, brandSupplier);
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(BrandSupplier brandSupplier) {
-		if(StringUtils.isNotBlank(brandSupplier.getId())){
-			Map<String, Object> param = new HashMap<String, Object>();
-			param.put("supplierID", brandSupplier.getId());
-			param.put("enabledStatus", brandSupplier.getEnabledStatus());
-			this.brandProductDao.changeStatus(param );
-		}
-		super.save(brandSupplier);
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(BrandSupplier brandSupplier) {
-		super.delete(brandSupplier);
-	}
-	
-	@Transactional(readOnly = false)
-	public void changeStatus(BrandSupplier brandSupplier) {
-		// 更新供应商状态
-		Map<String, Object> param = new HashMap<String, Object>();
-		param.put("id", brandSupplier.getId());
-		param.put("enabledStatus", brandSupplier.getEnabledStatus());
-		brandSupplierDao.changeStatus(param);
-		
-		// 关联更新其下所有商品的状态
-		param.clear();
-		param.put("supplierID", brandSupplier.getId());
-		param.put("enabledStatus", brandSupplier.getEnabledStatus());
-		this.brandProductDao.changeStatus(param );
-		
-	}
-	@Transactional(readOnly = false)
-	public void updateEnabledStatusByIds(String enabledStatus, String[] ids) {
-		brandSupplierDao.updateEnabledStatusByIds(enabledStatus,ids);
-	}
-	
-	
-	
-}

src/main/java/com/caimei/modules/brand/service/ProductModelService.java

@@ -1,15 +0,0 @@
-package com.caimei.modules.brand.service;
-
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.caimei.modules.brand.dao.ProductModelDao;
-import com.caimei.modules.brand.model.ProductModel;
-import com.thinkgem.jeesite.common.service.CrudService;
-
-
-@Service
-@Transactional(readOnly = true)
-public class ProductModelService extends CrudService<ProductModelDao, ProductModel> {
-
-}

src/main/java/com/caimei/modules/brand/service/ShopModelService.java

@@ -1,15 +0,0 @@
-package com.caimei.modules.brand.service;
-
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.caimei.modules.brand.dao.ShopModelDao;
-import com.caimei.modules.brand.model.ShopModel;
-import com.thinkgem.jeesite.common.service.CrudService;
-
-
-@Service
-@Transactional(readOnly = true)
-public class ShopModelService extends CrudService<ShopModelDao, ShopModel> {
-
-}

src/main/java/com/caimei/modules/brand/web/BrandAgentController.java

@@ -1,124 +0,0 @@
-package com.caimei.modules.brand.web;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.caimei.modules.brand.entity.BrandAgent;
-import com.caimei.modules.brand.service.BrandAgentService;
-import com.thinkgem.jeesite.common.config.Global;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.utils.StringUtils;
-import com.thinkgem.jeesite.common.web.BaseController;
-
-/**
- * 品牌联盟代理商Controller
- * @author LG
- * @version 2016-05-13
- */
-@Controller
-@RequestMapping(value = "${adminPath}/brand/brandAgent")
-public class BrandAgentController extends BaseController {
-
-	@Autowired
-	private BrandAgentService brandAgentService;
-	
-	@ModelAttribute
-	public BrandAgent get(@RequestParam(required=false) String id) {
-		BrandAgent entity = null;
-		if (StringUtils.isNotBlank(id)){
-			entity = brandAgentService.get(id);
-		}
-		if (entity == null){
-			entity = new BrandAgent();
-		}
-		return entity;
-	}
-	
-	@RequiresPermissions("brand:brandAgent:view")
-	@RequestMapping(value = {"list", ""})
-	public String list(BrandAgent brandAgent, HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<BrandAgent> page = brandAgentService.findPage(new Page<BrandAgent>(request, response), brandAgent); 
-		model.addAttribute("page", page);
-		return "modules/brand/brandAgentList";
-	}
-
-	@RequiresPermissions("brand:brandAgent:view")
-	@RequestMapping(value = "form")
-	public String form(BrandAgent brandAgent, Integer drawboardType, String redirectUrl, Model model) {
-		model.addAttribute("brandAgent", brandAgent);
-		model.addAttribute("drawboardType", drawboardType);
-		model.addAttribute("redirectUrl", redirectUrl);
-		if(StringUtils.isNotBlank(brandAgent.getName())) {
-			try {
-				model.addAttribute("bname", URLEncoder.encode(URLEncoder.encode(brandAgent.getName(), "utf-8"), "utf-8"));
-			} catch (UnsupportedEncodingException e) {
-				e.printStackTrace();
-			}
-		}
-		return "modules/brand/brandAgentForm";
-	}
-
-	@RequiresPermissions("brand:brandAgent:edit")
-	@RequestMapping(value = "save")
-	public String save(BrandAgent brandAgent, Integer drawboardType, String redirectUrl, Model model, RedirectAttributes redirectAttributes) {
-		if (!beanValidator(model, brandAgent)){
-			return form(brandAgent, drawboardType, redirectUrl, model);
-		}
-		brandAgentService.save(brandAgent);
-		if(drawboardType != null && drawboardType == 1) {
-			String bname = "";
-			try {
-				bname = URLEncoder.encode(URLEncoder.encode(brandAgent.getName(), "utf-8"), "utf-8");
-			} catch (UnsupportedEncodingException e) {
-				e.printStackTrace();
-			}
-			return "redirect:" + Global.getAdminPath()+ redirectUrl + "?drawboardType=" + drawboardType + "&bid=" + brandAgent.getId() + "&bname=" + bname;
-		}
-		addMessage(redirectAttributes, "保存品牌联盟代理商成功");
-		return "redirect:"+Global.getAdminPath()+"/brand/brandAgent/?repage";
-	}
-	
-	@RequiresPermissions("brand:brandAgent:edit")
-	@RequestMapping(value = "delete")
-	public String delete(BrandAgent brandAgent, RedirectAttributes redirectAttributes) {
-		brandAgentService.delete(brandAgent);
-		addMessage(redirectAttributes, "删除品牌联盟代理商成功");
-		return "redirect:"+Global.getAdminPath()+"/brand/brandAgent/?repage";
-	}
-	
-	/**
-	 * 品牌联盟代理商单选框
-	 * @param brandAgent
-	 * @param request
-	 * @param response
-	 * @param model
-	 * @return
-	 */
-	@RequestMapping(value = { "agentList_singleselect" })
-	public String agentListPageSingle(BrandAgent brandAgent,HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<BrandAgent> page = brandAgentService.findPage(new Page<BrandAgent>(request, response), brandAgent); 
-		model.addAttribute("page", page);
-		return "modules/brand/agentList_singleselect";
-	}
-	
-	@RequiresPermissions("brand:brandAgent:edit")
-	@RequestMapping(value = "changeStatus")
-	public String changeStatus(BrandAgent brandAgent, RedirectAttributes redirectAttributes) {
-		brandAgentService.changeStatus(brandAgent);
-		addMessage(redirectAttributes, "更新品牌联盟代理商状态成功");
-		return "redirect:"+Global.getAdminPath()+"/brand/brandAgent/?repage";
-	}
-
-}

src/main/java/com/caimei/modules/brand/web/BrandIdentificationCodeController.java

@@ -1,93 +0,0 @@
-package com.caimei.modules.brand.web;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.caimei.modules.brand.entity.BrandIdentificationCode;
-import com.caimei.modules.brand.service.BrandIdentificationCodeService;
-import com.thinkgem.jeesite.common.config.Global;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.utils.StringUtils;
-import com.thinkgem.jeesite.common.web.BaseController;
-
-/**
- * 商品标识码Controller
- * @author demon
- * @version 2016-05-20
- */
-@Controller
-@RequestMapping(value = "${adminPath}/brand/brandIdentificationCode")
-public class BrandIdentificationCodeController extends BaseController {
-
-	@Autowired
-	private BrandIdentificationCodeService brandIdentificationCodeService;
-	
-	@ModelAttribute
-	public BrandIdentificationCode get(@RequestParam(required=false) String id) {
-		BrandIdentificationCode entity = null;
-		if (StringUtils.isNotBlank(id)){
-			entity = brandIdentificationCodeService.get(id);
-		}
-		if (entity == null){
-			entity = new BrandIdentificationCode();
-		}
-		return entity;
-	}
-	
-	@RequiresPermissions("brand:brandIdentificationCode:view")
-	@RequestMapping(value = {"list", ""})
-	public String list(BrandIdentificationCode brandIdentificationCode, HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<BrandIdentificationCode> page = brandIdentificationCodeService.findPage(new Page<BrandIdentificationCode>(request, response), brandIdentificationCode); 
-		model.addAttribute("page", page);
-		model.addAttribute("unusedNum", brandIdentificationCodeService.getUnusedNum());
-		return "modules/brand/brandIdentificationCodeList";
-	}
-
-	@RequiresPermissions("brand:brandIdentificationCode:view")
-	@RequestMapping(value = "form")
-	public String form(BrandIdentificationCode brandIdentificationCode, Model model) {
-		model.addAttribute("brandIdentificationCode", brandIdentificationCode);
-		return "modules/brand/brandIdentificationCodeForm";
-	}
-
-	@RequiresPermissions("brand:brandIdentificationCode:edit")
-	@RequestMapping(value = "save")
-	public String save(BrandIdentificationCode brandIdentificationCode, Model model, RedirectAttributes redirectAttributes) {
-		if (!beanValidator(model, brandIdentificationCode)){
-			return form(brandIdentificationCode, model);
-		}
-		brandIdentificationCodeService.save(brandIdentificationCode);
-		addMessage(redirectAttributes, "保存商品标识码成功");
-		return "redirect:"+Global.getAdminPath()+"/brand/brandIdentificationCode/?repage";
-	}
-	
-	@RequiresPermissions("brand:brandIdentificationCode:edit")
-	@RequestMapping(value = "delete")
-	public String delete(BrandIdentificationCode brandIdentificationCode, RedirectAttributes redirectAttributes) {
-		brandIdentificationCodeService.delete(brandIdentificationCode);
-		addMessage(redirectAttributes, "删除商品标识码成功");
-		return "redirect:"+Global.getAdminPath()+"/brand/brandIdentificationCode/?repage";
-	}
-	
-	@RequiresPermissions("brand:brandIdentificationCode:edit")
-	@RequestMapping(value = "generate")
-	public String generate(Integer genCount, Model model, RedirectAttributes redirectAttributes) {
-		if(genCount == null || genCount <= 0) {
-			addMessage(redirectAttributes, "请输入正确的生成数量");
-		} else {
-			brandIdentificationCodeService.generate(genCount);
-			addMessage(redirectAttributes, "生成商品标识码成功");
-		}
-		return "redirect:"+Global.getAdminPath()+"/brand/brandIdentificationCode/?repage";
-	}
-
-}

src/main/java/com/caimei/modules/brand/web/BrandProductController.java

@@ -1,396 +0,0 @@
-package com.caimei.modules.brand.web;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.caimei.modules.brand.entity.BrandAgent;
-import com.caimei.modules.brand.entity.BrandProduct;
-import com.caimei.modules.brand.entity.BrandPurchaser;
-import com.caimei.modules.brand.entity.BrandSupplier;
-import com.caimei.modules.brand.model.ProductModel;
-import com.caimei.modules.brand.service.BrandProductService;
-import com.caimei.modules.brand.service.BrandSupplierService;
-import com.caimei.modules.brand.service.ProductModelService;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.thinkgem.jeesite.common.config.Global;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.utils.StringUtils;
-import com.thinkgem.jeesite.common.web.BaseController;
-
-/**
- * 品牌联盟商品Controller
- * @author LG
- * @version 2016-05-13
- */
-@Controller
-@RequestMapping(value = "${adminPath}/brand/brandProduct")
-public class BrandProductController extends BaseController {
-
-	@Autowired
-	private BrandProductService brandProductService;
-	
-	@Autowired
-	private BrandSupplierService brandSupplierService;
-	
-	@Autowired
-	private ProductModelService productModelService;
-	
-	@ModelAttribute
-	public BrandProduct get(@RequestParam(required=false) String id) {
-		BrandProduct entity = null;
-		if (StringUtils.isNotBlank(id)){
-			entity = brandProductService.get(id);
-		}
-		if (entity == null){
-			entity = new BrandProduct();
-		}
-		return entity;
-	}
-	
-	@RequiresPermissions("brand:brandProduct:view")
-	@RequestMapping(value = {"list", ""})
-	public String list(BrandProduct brandProduct, HttpSession session,HttpServletRequest request, HttpServletResponse response, Model model) {
-		session.removeAttribute("brandProduct_session_edit");
-		session.removeAttribute("brandProduct_session");
-		Page<BrandProduct> page = brandProductService.findPage(new Page<BrandProduct>(request, response), brandProduct); 
-		List<BrandProduct> list = page.getList();
-		List<BrandProduct> list1=Lists.newArrayList();
-		if(CollectionUtils.isNotEmpty(list)){
-			for (int i = 0; i < list.size(); i++) {
-				brandProduct=brandProductService.get(list.get(i).getId());
-				list1.add(i, brandProduct);
-			}
-		}
-		page.setList(list1);
-		model.addAttribute("page", page);
-		return "modules/brand/brandProductList";
-	}
-
-	@RequiresPermissions("brand:brandProduct:view")
-	@RequestMapping(value = "form")
-	public String form(BrandProduct brandProduct, Model model,HttpSession session, @RequestParam(defaultValue="-1") Integer drawboardType,  String bid,String bname) {
-		if(drawboardType > -1 && bid != null && bid.trim().length() > 0 && !bid.equals("0")) {	
-			BrandProduct bp = (BrandProduct) session.getAttribute("brandProduct_session_edit");
-			if(null!=bp)brandProduct=bp;
-			session.removeAttribute("brandProduct_session_edit");
-			switch (drawboardType) {
-			case 0:
-				BrandSupplier brandSupplier = new BrandSupplier();
-				brandSupplier.setId(bid+"");
-				brandSupplier.setName(bname);
-				brandProduct.setBrandSupplier(brandSupplier);
-				break;
-			case 1:
-				BrandAgent brandAgent = new BrandAgent();
-				brandAgent.setId(bid+"");
-				brandAgent.setName(bname);
-				brandProduct.setBrandAgent(brandAgent);
-				break;
-			case 2:
-				BrandPurchaser brandPurchaser = new BrandPurchaser();
-				brandPurchaser.setId(bid+"");
-				brandPurchaser.setName(bname);
-				brandProduct.setBrandPurchaser(brandPurchaser);
-				break;
-			default:
-				break;
-			}
-			session.setAttribute("brandProduct_session_edit", brandProduct);
-			session.setMaxInactiveInterval(10*60);// 以秒为单位
-		}
-		model.addAttribute("brandProduct", brandProduct);
-		if(StringUtils.isNotBlank(brandProduct.getId())){
-			ProductModel productModel = productModelService.get(brandProduct.getProductID()+"");
-			model.addAttribute("productModel", productModel);
-			return "modules/brand/brandProductEdit";
-		}
-		
-		return "modules/brand/brandProductForm";
-	}
-	
-	@RequiresPermissions("brand:brandProduct:edit")
-	@RequestMapping(value = "save")
-	public String save(BrandProduct brandProduct,Model model, HttpSession session,RedirectAttributes redirectAttributes, HttpServletRequest request) {
-		if(StringUtils.isNotBlank(brandProduct.getId())){
-			BrandProduct bp = (BrandProduct) session.getAttribute("brandProduct_session_edit");
-			if(null!=bp){brandProduct=bp;}
-		}
-		session.removeAttribute("brandProduct_session_edit");
-		
-		String save="";
-		try {
-			save = brandProductService.save(brandProduct,request);
-			addMessage(redirectAttributes, "保存品牌联盟商品成功");
-		} catch (Exception e) {
-			logger.error(e.toString(),e);
-			addMessage(redirectAttributes, "图片上传错误："+save);
-		}
-		
-		return "redirect:"+Global.getAdminPath()+"/brand/brandProduct/?repage";
-	}
-	
-	@RequiresPermissions("brand:brandProduct:edit")
-	@RequestMapping(value = "delete")
-	public String delete(BrandProduct brandProduct, RedirectAttributes redirectAttributes) {
-		brandProductService.delete(brandProduct);
-		addMessage(redirectAttributes, "删除品牌联盟商品成功");
-		return "redirect:"+Global.getAdminPath()+"/brand/brandProduct/?repage";
-	}
-	
-	/**
-	 * 商品-厂商 单选窗口
-	 * @param request
-	 * @param response
-	 * @param model
-	 * @return
-	 */
-	@RequestMapping(value = { "productList_singleselect" })
-	public String listAllSingle(ProductModel productModel,HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<ProductModel> page = productModelService.findPage(new Page<ProductModel>(request, response), productModel); 
-		model.addAttribute("page", page);
-		return "modules/brand/productList_singleselect";
-	}
-	
-	/**
-	 * 
-	 * <p>Description: 新增同类商品</p>
-	 * <p>Company: caimei365</p> 
-	 * @author xun.zhang
-	 * @date 2016年5月18日 上午10:31:01
-	 * @param brandProduct
-	 * @param model
-	 * @return
-	 */
-	@RequiresPermissions("brand:brandProduct:view")
-	@RequestMapping(value = "sameProductForm")
-	public String sameProductForm(BrandProduct brandProduct, Model model, HttpSession session, @RequestParam(defaultValue="-1") Integer drawboardType, @RequestParam(defaultValue="") String bid, @RequestParam(defaultValue="") String bname) {
-		if(drawboardType > -1 && bid != null && bid.trim().length() > 0 && !bid.equals("0")) {
-			brandProduct = (BrandProduct) session.getAttribute("brandProduct_session");
-			try {
-				bname = URLDecoder.decode(bname, "utf8");
-			} catch (UnsupportedEncodingException e) {
-				e.printStackTrace();
-			}
-			if("0".equals(bid)) {
-				bid = "";
-			}
-			if(drawboardType == 0) {
-				BrandSupplier brandSupplier = new BrandSupplier();
-				brandSupplier.setId(bid+"");
-				brandSupplier.setName(bname);
-				brandProduct.setBrandSupplier(brandSupplier);
-			}else if(drawboardType == 1) {
-				BrandAgent brandAgent = new BrandAgent();
-				brandAgent.setId(bid+"");
-				brandAgent.setName(bname);
-				brandProduct.setBrandAgent(brandAgent);
-			}else if(drawboardType == 2) {
-				BrandPurchaser brandPurchaser = new BrandPurchaser();
-				brandPurchaser.setId(bid+"");
-				brandPurchaser.setName(bname);
-				brandProduct.setBrandPurchaser(brandPurchaser);
-			}
-		}else {
-			brandProduct.setBrandAgent(null);
-			brandProduct.setBrandPurchaser(null);
-			brandProduct.setSn(null);
-			brandProduct.setShowAgent("0");
-			brandProduct.setShowPurchaser("0");
-		}
-		brandProduct.setFileNumber(null);
-		model.addAttribute("brandProduct", brandProduct);
-		return "modules/brand/brandSameProductForm";
-	}
-	
-	/**
-	 * 
-	 * <p>Description: 中途去编辑供应商信息、代理商信息、购买者信息的跳板</p>
-	 * <p>Company: caimei365</p> 
-	 * @author xun.zhang
-	 * @date 2016年5月18日 上午10:37:20
-	 * @param brandProduct
-	 * @param model
-	 * @param drawboardType 跳转到相应的编辑页面(0 供应商,1 代理商,2 购买者)
-	 * @return
-	 */
-	@RequestMapping(value = "drawboard")
-	public String drawboard(BrandProduct brandProduct, 
-							Model model, 
-							HttpSession session, 
-							Integer drawboardType,
-							@RequestParam(defaultValue="") String bid,
-							@RequestParam(defaultValue="0") String showAgent,
-							@RequestParam(defaultValue="0") String showPurchaser) {
-		brandProduct.setFileNumber(null);
-		brandProduct.setShowAgent(showAgent);
-		brandProduct.setShowPurchaser(showPurchaser);
-		session.setAttribute("brandProduct_session", brandProduct);
-		session.setMaxInactiveInterval(10*60);// 以秒为单位
-		String redirectUrl = "";
-		if(drawboardType == 0) {
-			redirectUrl = "/brand/brandSupplier/form";
-		}else if(drawboardType == 1) {
-			redirectUrl = "/brand/brandAgent/form";
-		}else if(drawboardType == 2) {
-			redirectUrl = "/brand/brandPurchaser/form";
-		}
-		try {
-			redirectUrl += "?drawboardType="+drawboardType+"&redirectUrl="+URLEncoder.encode("/brand/brandProduct/sameProductForm", "utf8");
-			if(!"".equals(bid)) {
-				redirectUrl += "&id=" + bid;
-			}
-		} catch (UnsupportedEncodingException e) {
-			e.printStackTrace();
-		}
-		return "redirect:"+Global.getAdminPath()+redirectUrl;
-	}
-	
-	
-	/**
-	 * 编辑商品
-	 * <p>Description: 中途去编辑供应商信息、代理商信息、购买者信息的跳板</p>
-	 * <p>Company: caimei365</p> 
-	 * @author xun.zhang
-	 * @date 2016年5月18日 上午10:37:20
-	 * @param brandProduct
-	 * @param model
-	 * @param drawboardType 跳转到相应的编辑页面(0 供应商,1 代理商,2 购买者)
-	 * @return
-	 */
-	@RequestMapping(value = "drawboardEdit")
-	public String drawboardEdit(BrandProduct brandProduct, Model model, HttpSession session, Integer drawboardType,String bid) {
-		//brandProduct.setFileNumber(null);
-		BrandProduct bp = (BrandProduct) session.getAttribute("brandProduct_session_edit");
-		if(null!=bp){
-			brandProduct=bp;
-		}else{
-			session.setAttribute("brandProduct_session_edit", brandProduct);
-			session.setMaxInactiveInterval(10*60);// 以秒为单位
-		}
-		String redirectUrl = "";
-		if(drawboardType == 0) {
-			redirectUrl = "/brand/brandSupplier/form";
-		}else if(drawboardType == 1) {
-			redirectUrl = "/brand/brandAgent/form";
-		}else if(drawboardType == 2) {
-			redirectUrl = "/brand/brandPurchaser/form";
-		}
-		redirectUrl += "?id="+bid+"&drawboardType="+drawboardType+"&redirectUrl=/brand/brandProduct/form";
-		return "redirect:"+Global.getAdminPath()+redirectUrl;
-	}
-	
-	@RequiresPermissions("brand:brandProduct:edit")
-	@RequestMapping(value = "sameProductSave")
-	public String sameProductSave(BrandProduct brandProduct, RedirectAttributes redirectAttributes, Model model, HttpServletRequest request) {
-		brandProduct.setId(null);
-		brandProduct.setFileNumber(null);
-		brandProductService.sameProductSave(brandProduct, request);
-		addMessage(redirectAttributes, "保存品牌联盟商品成功");
-		return "redirect:"+Global.getAdminPath()+"/brand/brandProduct/?repage";
-	}
-
-	@RequiresPermissions("brand:brandProduct:edit")
-	@RequestMapping(value = "changeStatus")
-	public String changeStatus(BrandProduct brandProduct, RedirectAttributes redirectAttributes) {
-		brandProductService.changeStatus(brandProduct);
-		if(StringUtils.equals("1", brandProduct.getEnabledStatus())){
-			String [] supplierIDs=new String[1];
-			supplierIDs[0]=brandProduct.getBrandSupplier().getId();
-			brandSupplierService.updateEnabledStatusByIds(brandProduct.getEnabledStatus(),supplierIDs);
-		}
-		addMessage(redirectAttributes, "更新品牌联盟商品状态成功");
-		return "redirect:"+Global.getAdminPath()+"/brand/brandProduct/?repage";
-	}
-	
-	/**
-	 * 批量修改启用、停用状态
-	 * @param enabledStatus
-	 * @param ids
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	@RequiresPermissions("brand:brandProduct:edit")
-	@ResponseBody
-	@RequestMapping(value="updateEnabledStatus")
-	public Map<String, Object> updateEnabledStatus(String enabledStatus,String[] ids,String [] supplierIDs,HttpServletRequest request,HttpServletResponse response){
-		Map<String, Object> map =Maps.newLinkedHashMap();
-		try {
-			brandProductService.updateEnabledStatusByIds(enabledStatus,ids);
-			if(StringUtils.equals("1",enabledStatus)){
-				brandSupplierService.updateEnabledStatusByIds(enabledStatus,supplierIDs);
-			}
-			map.put("success",true);
-			map.put("msg", "修改成功");
-		} catch (Exception e) {
-			logger.debug(e.toString(),e);
-			map.put("success",false);
-			map.put("msg", "修改失败");
-		}
-        return map;  
-	}
-	
-	/**
-	 * 修改显示项
-	 * @param brandProduct
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	@RequiresPermissions("brand:brandProduct:edit")
-	@ResponseBody
-	@RequestMapping(value="updateShow")
-	public Map<String, Object> updateShow(BrandProduct brandProduct,HttpServletRequest request,HttpServletResponse response){
-		Map<String, Object> map =Maps.newLinkedHashMap();
-		try {
-			brandProductService.save(brandProduct);
-			map.put("success",true);
-			map.put("msg", "修改成功");
-		} catch (Exception e) {
-			logger.debug(e.toString(),e);
-			map.put("success",false);
-			map.put("msg", "修改失败");
-		}
-		return map;  
-	}
-	
-	/**
-	 * 验证Sn码是否存在
-	 * @param mobileNo
-	 * @return
-	 */
-	@ResponseBody
-	@RequestMapping(value = "checkSn")
-	public String checkSn(String sn,String oldSn) {
-		if(StringUtils.equals(sn, oldSn)){
-			return "true";
-		}
-		BrandProduct brandProduct=new BrandProduct();
-		brandProduct.setSn(sn);
-		List<BrandProduct> list = brandProductService.findList(brandProduct);
-		if(CollectionUtils.isEmpty(list)){
-			return "true";
-		}
-		return "false";
-	}
-	
-}

src/main/java/com/caimei/modules/brand/web/BrandProductsController.java

@@ -1,163 +0,0 @@
-package com.caimei.modules.brand.web;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.caimei.modules.brand.entity.BrandProducts;
-import com.caimei.modules.brand.service.BrandProductsService;
-import com.google.common.collect.Maps;
-import com.thinkgem.jeesite.common.config.Global;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.utils.StringUtils;
-import com.thinkgem.jeesite.common.web.BaseController;
-
-/**
- * 商品管理Controller
- * @author LG
- * @version 2016-08-24
- */
-@Controller
-@RequestMapping(value = "${adminPath}/brand/brandProducts")
-public class BrandProductsController extends BaseController {
-
-	@Autowired
-	private BrandProductsService brandProductsService;
-	
-	@ModelAttribute
-	public BrandProducts get(@RequestParam(required=false) String id) {
-		BrandProducts entity = null;
-		if (StringUtils.isNotBlank(id)){
-			entity = brandProductsService.get(id);
-		}
-		if (entity == null){
-			entity = new BrandProducts();
-		}
-		return entity;
-	}
-	
-	@RequiresPermissions("brand:brandProducts:view")
-	@RequestMapping(value = {"list", ""})
-	public String list(BrandProducts brandProducts, HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<BrandProducts> page = brandProductsService.findPage(new Page<BrandProducts>(request, response), brandProducts); 
-		model.addAttribute("page", page);
-		return "modules/brand/brandProductsList";
-	}
-
-	@RequiresPermissions("brand:brandProducts:view")
-	@RequestMapping(value = "form")
-	public String form(BrandProducts brandProducts, Model model) {
-		model.addAttribute("brandProducts", brandProducts);
-		return "modules/brand/brandProductsForm";
-	}
-	
-	@RequiresPermissions("brand:brandProducts:view")
-	@RequestMapping(value = "sameform")
-	public String sameform(BrandProducts brandProducts, Model model) {
-		brandProducts.setId(null);
-		brandProducts.setSn(null);
-		brandProducts.setIdentificationCode(null);
-		brandProducts.setQueryNum(0);
-		brandProducts.setScanNum(0);
-		model.addAttribute("brandProducts", brandProducts);
-		return "modules/brand/brandProductsForm";
-	}
-
-	@RequiresPermissions("brand:brandProducts:edit")
-	@RequestMapping(value = "save")
-	public String save(BrandProducts brandProducts, Model model, RedirectAttributes redirectAttributes, HttpServletRequest request) {
-		if (!beanValidator(model, brandProducts)){
-			return form(brandProducts, model);
-		}
-		try {
-			brandProductsService.save(brandProducts,request);
-			addMessage(redirectAttributes, "保存商品管理成功");
-		} catch (Exception e) {
-			logger.error(e.toString(),e);
-			addMessage(redirectAttributes, "保存失败："+e.toString());
-		}
-		return "redirect:"+Global.getAdminPath()+"/brand/brandProducts/?repage";
-	}
-	
-	@RequiresPermissions("brand:brandProducts:delete")
-	@RequestMapping(value = "delete")
-	public String delete(BrandProducts brandProducts, RedirectAttributes redirectAttributes) {
-		brandProductsService.delete(brandProducts);
-		addMessage(redirectAttributes, "删除商品管理成功");
-		return "redirect:"+Global.getAdminPath()+"/brand/brandProducts/?repage";
-	}
-
-	/**
-	 * 批量修改启用、停用状态
-	 * @param enabledStatus
-	 * @param ids
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	@RequiresPermissions("brand:brandProduct:edit")
-	@ResponseBody
-	@RequestMapping(value="updateEnabledStatus")
-	public Map<String, Object> updateEnabledStatus(String status,String[] ids,HttpServletRequest request,HttpServletResponse response){
-		Map<String, Object> map =Maps.newLinkedHashMap();
-		try {
-			brandProductsService.updateEnabledStatusByIds(status,ids);
-			map.put("success",true);
-			map.put("msg", "修改成功");
-		} catch (Exception e) {
-			logger.debug(e.toString(),e);
-			map.put("success",false);
-			map.put("msg", "修改失败");
-		}
-        return map;  
-	}
-	
-	/**
-	 * 验证Sn码是否存在
-	 * @param Sn
-	 * @return
-	 */
-	@ResponseBody
-	@RequestMapping(value = "checkSn")
-	public String checkSn(String sn,String oldSn) {
-		if(StringUtils.equals(sn, oldSn)){
-			return "true";
-		}
-		List<BrandProducts> list = brandProductsService.findBySn(sn);
-		if(CollectionUtils.isEmpty(list)){
-			return "true";
-		}
-		return "false";
-	}
-	
-	/**
-	 * 验证identificationCode码是否存在
-	 * @param identificationCode
-	 * @return
-	 */
-	@ResponseBody
-	@RequestMapping(value = "checkIdentificationCode")
-	public String checkIdentificationCode(String identificationCode,String oldidentificationCode) {
-		if(StringUtils.equals(identificationCode, oldidentificationCode)){
-			return "true";
-		}
-		List<BrandProducts> list = brandProductsService.findByIdentificationCode(identificationCode);
-		if(CollectionUtils.isEmpty(list)){
-			return "true";
-		}
-		return "false";
-	}
-}

src/main/java/com/caimei/modules/brand/web/BrandPurchaserController.java

@@ -1,127 +0,0 @@
-package com.caimei.modules.brand.web;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.caimei.modules.brand.entity.BrandPurchaser;
-import com.caimei.modules.brand.service.BrandPurchaserService;
-import com.thinkgem.jeesite.common.config.Global;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.utils.StringUtils;
-import com.thinkgem.jeesite.common.web.BaseController;
-
-/**
- * 品牌联盟购买者Controller
- * @author LG
- * @version 2016-05-13
- */
-@Controller
-@RequestMapping(value = "${adminPath}/brand/brandPurchaser")
-public class BrandPurchaserController extends BaseController {
-
-	@Autowired
-	private BrandPurchaserService brandPurchaserService;
-	
-	@ModelAttribute
-	public BrandPurchaser get(@RequestParam(required=false) String id) {
-		BrandPurchaser entity = null;
-		if (StringUtils.isNotBlank(id)){
-			entity = brandPurchaserService.get(id);
-		}
-		if (entity == null){
-			entity = new BrandPurchaser();
-		}
-		return entity;
-	}
-	
-	@RequiresPermissions("brand:brandPurchaser:view")
-	@RequestMapping(value = {"list", ""})
-	public String list(BrandPurchaser brandPurchaser, HttpServletRequest request, HttpServletResponse response, Model model) {
-//		System.out.println("BrandPurchaserController.save()>>> watermark" + request.getSession().getServletContext().getRealPath("watermark"));
-		Page<BrandPurchaser> page = brandPurchaserService.findPage(new Page<BrandPurchaser>(request, response), brandPurchaser); 
-		model.addAttribute("page", page);
-		return "modules/brand/brandPurchaserList";
-	}
-
-	@RequiresPermissions("brand:brandPurchaser:view")
-	@RequestMapping(value = "form")
-	public String form(BrandPurchaser brandPurchaser, Integer drawboardType, String redirectUrl, Model model) {
-		model.addAttribute("brandPurchaser", brandPurchaser);
-		model.addAttribute("drawboardType", drawboardType);
-		model.addAttribute("redirectUrl", redirectUrl);
-		if(StringUtils.isNotBlank(brandPurchaser.getName())) {
-			try {
-				model.addAttribute("bname", URLEncoder.encode(URLEncoder.encode(brandPurchaser.getName(), "utf-8"), "utf-8"));
-			} catch (UnsupportedEncodingException e) {
-				e.printStackTrace();
-			}
-		}
-		return "modules/brand/brandPurchaserForm";
-	}
-
-	@RequiresPermissions("brand:brandPurchaser:edit")
-	@RequestMapping(value = "save")
-	public String save(BrandPurchaser brandPurchaser, Integer drawboardType, String redirectUrl, Model model, RedirectAttributes redirectAttributes, HttpServletRequest request) {
-		if (!beanValidator(model, brandPurchaser)){
-			return form(brandPurchaser, drawboardType, redirectUrl, model);
-		}
-		
-		brandPurchaserService.save(brandPurchaser, request);
-		if(drawboardType != null && drawboardType == 2) {
-			String bname = "";
-			try {
-				bname = URLEncoder.encode(URLEncoder.encode(brandPurchaser.getName(), "utf-8"), "utf-8");
-			} catch (UnsupportedEncodingException e) {
-				e.printStackTrace();
-			}
-			return "redirect:" + Global.getAdminPath()+ redirectUrl + "?drawboardType=" + drawboardType + "&bid=" + brandPurchaser.getId() + "&bname=" + bname;
-		}
-		
-		addMessage(redirectAttributes, "保存品牌联盟购买者成功");
-		return "redirect:"+Global.getAdminPath()+"/brand/brandPurchaser/?repage";
-	}
-	
-	@RequiresPermissions("brand:brandPurchaser:edit")
-	@RequestMapping(value = "delete")
-	public String delete(BrandPurchaser brandPurchaser, RedirectAttributes redirectAttributes) {
-		brandPurchaserService.delete(brandPurchaser);
-		addMessage(redirectAttributes, "删除品牌联盟购买者成功");
-		return "redirect:"+Global.getAdminPath()+"/brand/brandPurchaser/?repage";
-	}
-	
-	/**
-	 * 购买者单选框
-	 * @param brandPurchaser
-	 * @param request
-	 * @param response
-	 * @param model
-	 * @return
-	 */
-	@RequestMapping(value = { "purchaserList_singleselect" })
-	public String purchaserListPageSingle(BrandPurchaser brandPurchaser,HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<BrandPurchaser> page = brandPurchaserService.findPage(new Page<BrandPurchaser>(request, response), brandPurchaser); 
-		model.addAttribute("page", page);
-		return "modules/brand/purchaserList_singleselect";
-	}
-
-	@RequiresPermissions("brand:brandPurchaser:edit")
-	@RequestMapping(value = "changeStatus")
-	public String changeStatus(BrandPurchaser brandPurchaser, RedirectAttributes redirectAttributes) {
-		brandPurchaserService.changeStatus(brandPurchaser);
-		addMessage(redirectAttributes, "更新品牌联盟购买者状态成功");
-		return "redirect:"+Global.getAdminPath()+"/brand/brandPurchaser/?repage";
-	}
-	
-}

src/main/java/com/caimei/modules/brand/web/BrandSupplierController.java

@@ -1,136 +0,0 @@
-package com.caimei.modules.brand.web;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.caimei.modules.brand.entity.BrandSupplier;
-import com.caimei.modules.brand.model.ShopModel;
-import com.caimei.modules.brand.service.BrandSupplierService;
-import com.caimei.modules.brand.service.ShopModelService;
-import com.thinkgem.jeesite.common.config.Global;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.utils.StringUtils;
-import com.thinkgem.jeesite.common.web.BaseController;
-
-/**
- * 品牌供应商Controller
- * @author LG
- * @version 2016-05-13
- */
-@Controller
-@RequestMapping(value = "${adminPath}/brand/brandSupplier")
-public class BrandSupplierController extends BaseController {
-
-	@Autowired
-	private BrandSupplierService brandSupplierService;
-	@Autowired
-	private ShopModelService supplierModelService;
-	
-	@ModelAttribute
-	public BrandSupplier get(@RequestParam(required=false) String id) {
-		BrandSupplier entity = null;
-		if (StringUtils.isNotBlank(id)){
-			entity = brandSupplierService.get(id);
-		}
-		if (entity == null){
-			entity = new BrandSupplier();
-		}
-		return entity;
-	}
-	
-	@RequiresPermissions("brand:brandSupplier:view")
-	@RequestMapping(value = {"list", ""})
-	public String list(BrandSupplier brandSupplier, HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<BrandSupplier> page = brandSupplierService.findPage(new Page<BrandSupplier>(request, response), brandSupplier); 
-		model.addAttribute("page", page);
-		return "modules/brand/brandSupplierList";
-	}
-
-	@RequiresPermissions("brand:brandSupplier:view")
-	@RequestMapping(value = "form")
-	public String form(BrandSupplier brandSupplier, Integer drawboardType, String redirectUrl, Model model) {
-		model.addAttribute("brandSupplier", brandSupplier);
-		model.addAttribute("drawboardType", drawboardType);
-		model.addAttribute("redirectUrl", redirectUrl);
-		if(StringUtils.isNotBlank(brandSupplier.getName())) {
-			try {
-				model.addAttribute("bname", URLEncoder.encode(URLEncoder.encode(brandSupplier.getName(), "utf-8"), "utf-8"));
-			} catch (UnsupportedEncodingException e) {
-				e.printStackTrace();
-			}
-		}
-		return "modules/brand/brandSupplierForm";
-	}
-
-	@RequiresPermissions("brand:brandSupplier:edit")
-	@RequestMapping(value = "save")
-	public String save(BrandSupplier brandSupplier, Integer drawboardType, String redirectUrl, Model model, RedirectAttributes redirectAttributes) {
-		if (!beanValidator(model, brandSupplier)){
-			return form(brandSupplier, drawboardType, redirectUrl, model);
-		}
-		brandSupplierService.save(brandSupplier);
-		if(drawboardType != null && drawboardType == 0) {
-			String bname = "";
-			try {
-				bname = URLEncoder.encode(URLEncoder.encode(brandSupplier.getName(), "utf-8"), "utf-8");
-			} catch (UnsupportedEncodingException e) {
-				e.printStackTrace();
-			}
-			return "redirect:" + Global.getAdminPath()+ redirectUrl + "?drawboardType=" + drawboardType + "&bid=" + brandSupplier.getId() + "&bname=" + bname;
-		}
-		
-		addMessage(redirectAttributes, "保存品牌供应商成功");
-		return "redirect:"+Global.getAdminPath()+"/brand/brandSupplier/?repage";
-	}
-	
-	@RequiresPermissions("brand:brandSupplier:edit")
-	@RequestMapping(value = "delete")
-	public String delete(BrandSupplier brandSupplier, RedirectAttributes redirectAttributes) {
-		brandSupplierService.delete(brandSupplier);
-		addMessage(redirectAttributes, "删除品牌供应商成功");
-		return "redirect:"+Global.getAdminPath()+"/brand/brandSupplier/?repage";
-	}
-	
-	@RequestMapping(value = { "shopList_singleselect" })
-	public String listPageSingle(ShopModel shopModel,HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<ShopModel> page = supplierModelService.findPage(new Page<ShopModel>(request, response), shopModel); 
-		model.addAttribute("page", page);
-		return "modules/brand/shopList_singleselect";
-	}
-	
-	/**
-	 * 品牌供应商单选框
-	 * @param brandSupplier
-	 * @param request
-	 * @param response
-	 * @param model
-	 * @return
-	 */
-	@RequestMapping(value = { "supplierList_singleselect" })
-	public String supplierListPageSingle(BrandSupplier brandSupplier,HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<BrandSupplier> page = brandSupplierService.findPage(new Page<BrandSupplier>(request, response), brandSupplier); 
-		model.addAttribute("page", page);
-		return "modules/brand/supplierList_singleselect";
-	}
-	
-	@RequiresPermissions("brand:brandSupplier:edit")
-	@RequestMapping(value = "changeStatus")
-	public String changeStatus(BrandSupplier brandSupplier, Model model, RedirectAttributes redirectAttributes) {
-		brandSupplierService.changeStatus(brandSupplier);
-		addMessage(redirectAttributes, "更新品牌供应商状态成功");
-		return "redirect:"+Global.getAdminPath()+"/brand/brandSupplier/?repage";
-	}
-
-}

src/main/java/com/caimei/modules/bulkpurchase/dao/BpOrderCirculationDao.java

@@ -1,24 +0,0 @@
-package com.caimei.modules.bulkpurchase.dao;
-
-import com.caimei.modules.bulkpurchase.entity.BpOrderCirculation;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * .订单传阅DAO
- *
- * @author ZCP
- * @version 2017-08-03
- **/
-@MyBatisDao
-public interface BpOrderCirculationDao extends CrudDao<BpOrderCirculation> {
-
-    List<BpOrderCirculation> findAllList(BpOrderCirculation bpOrderCirculation);
-    void delete(Long userId);
-
-    void update(@Param("userId") String userId, @Param("buyerRole") String buyerRole,
-                @Param("shopRole") String shopRole, @Param("updateTime") String updateTime);
-}

src/main/java/com/caimei/modules/bulkpurchase/dao/BpOrderProductRemarkDao.java

@@ -1,15 +0,0 @@
-package com.caimei.modules.bulkpurchase.dao;
-
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.bulkpurchase.entity.BpOrderProductRemark;
-
-/**
- * 大宗采购订单商品备注DAO接口
- * @author LiJun
- * @version 2018-04-03
- */
-@MyBatisDao
-public interface BpOrderProductRemarkDao extends CrudDao<BpOrderProductRemark> {
-	
-}

src/main/java/com/caimei/modules/bulkpurchase/dao/BpOrderStagesShopDao.java

@@ -1,18 +0,0 @@
-package com.caimei.modules.bulkpurchase.dao;
-
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.bulkpurchase.entity.BpOrderStagesShop;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * 分期订单-应付供应商DAO接口
- * @author zcp
- * @version 2018-04-09
- */
-@MyBatisDao
-public interface BpOrderStagesShopDao extends CrudDao<BpOrderStagesShop> {
-
-    int deleteByOrderId(@Param("orderId")String orderId);
-
-}

src/main/java/com/caimei/modules/bulkpurchase/dao/BpOrderUserinfoDao.java

@@ -1,22 +0,0 @@
-package com.caimei.modules.bulkpurchase.dao;
-
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.bulkpurchase.entity.BpOrderUserinfo;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 订单客户详情DAO接口
- * @author jiangjunwen
- * @version 2017-04-07
- */
-@MyBatisDao
-public interface BpOrderUserinfoDao extends CrudDao<BpOrderUserinfo> {
-
-    List<BpOrderUserinfo> selectUserInfoById(String id);
-
-    List<Map<String,String>> findCityByUserId(Long userId);
-    BpOrderUserinfo getWithorderId(String orderId);
-}

src/main/java/com/caimei/modules/bulkpurchase/dao/CmFinanceChargeDao.java

@@ -1,26 +0,0 @@
-package com.caimei.modules.bulkpurchase.dao;
-
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.bulkpurchase.entity.CmFinanceCharge;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 出账信息DAO接口
- * @author LiJun
- * @version 2017-06-04
- */
-@MyBatisDao
-public interface CmFinanceChargeDao extends CrudDao<CmFinanceCharge> {
-
-    Long getMaxPrimaryKey();
-    List<CmFinanceCharge>  findListByProductId(@Param("productId")String productId);
-    List<CmFinanceCharge>  findListGroupByproductIds(@Param("productId")String productId);
-    Double findShopPayByProductId(@Param("productId")String productId);
-    Double findOtherPayByProductId(@Param("productId")String productId);
-
-    //分期应付
-    List<CmFinanceCharge>  findListByStagesId(@Param("stagesId")String stagesId);
-}

src/main/java/com/caimei/modules/bulkpurchase/dao/CmFinanceChargeStagesDao.java

@@ -1,20 +0,0 @@
-package com.caimei.modules.bulkpurchase.dao;
-
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.bulkpurchase.entity.CmFinanceChargeStages;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * 分期已付供应商列表DAO接口
- * @author zcp
- * @version 2018-04-11
- */
-@MyBatisDao
-public interface CmFinanceChargeStagesDao extends CrudDao<CmFinanceChargeStages> {
-
-    Double getSumByStagesId(@Param("stagesId")Integer stagesId , @Param("shopId") Integer shopId ,@Param("status") String status);
-
-    CmFinanceChargeStages getByChargeAndShop(@Param("chargeId")Integer chargeId , @Param("shopId") Integer shopId);
-
-}

src/main/java/com/caimei/modules/bulkpurchase/dao/CmFinanceReceiptsDao.java

@@ -1,39 +0,0 @@
-package com.caimei.modules.bulkpurchase.dao;
-
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.bulkpurchase.entity.CmFinanceReceipts;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Date;
-
-/**
- * 进账信息DAO接口
- * @author 李俊
- * @version 2017-06-04
- */
-@MyBatisDao
-public interface CmFinanceReceiptsDao extends CrudDao<CmFinanceReceipts> {
-    List<CmFinanceReceipts> findAllList();
-
-    int updateReviewStatusPass(@Param("orderProductId") String orderProductId,@Param("orderId")  String orderId,@Param("reStatus")  String reStatus,@Param("reviewDate")  Date  reviewDate);
-    int updateReviewStatusPassById(@Param("receiptsId")  String receiptsId,@Param("reStatus")  String reStatus,@Param("reviewDate")  Date  reviewDate);
-
-    int updateReviewStatusFail(@Param("orderProductId") String orderProductId,@Param("orderId")  String orderId,@Param("reStatus")  String reStatus);
-    int updateReviewStatusFailById(@Param("receiptsId") String receiptsId,@Param("reStatus")  String reStatus);
-
-    int deleteFinanceReceipts(@Param("orderProductId") String orderProductId,@Param("orderId")  String orderId);
-    int deleteFinanceReceiptsById(@Param("receiptsId")  String receiptsId);
-
-    List<CmFinanceReceipts> findListByProductIds(@Param("productIds") String productIds,@Param("orderId")  String orderId,@Param("status")  String status);
-    List<CmFinanceReceipts> findListByStagesId(@Param("stagesId") String stagesId,@Param("orderId")  String orderId,@Param("status")  String status);
-    int updateRecord(CmFinanceReceipts cmFinanceReceipts);
-
-    int updateStatus(CmFinanceReceipts cmFinanceReceipts);
-
-    int updateDeleteFlag(CmFinanceReceipts cmFinanceReceipts);
-
-    List<CmFinanceReceipts> getFinanceReceiptsByOrderNo(@Param("orderNo") String orderNo);
-
-}

src/main/java/com/caimei/modules/bulkpurchase/dao/CmRefundsRecordDao.java

@@ -1,15 +0,0 @@
-package com.caimei.modules.bulkpurchase.dao;
-
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.bulkpurchase.entity.CmRefundsRecord;
-
-/**
- * 协商记录列表DAO接口
- * @author sunqi
- * @version 2017-11-24
- */
-@MyBatisDao
-public interface CmRefundsRecordDao extends CrudDao<CmRefundsRecord> {
-	
-}

src/main/java/com/caimei/modules/bulkpurchase/dao/CommissionsDao.java

@@ -1,16 +0,0 @@
-package com.caimei.modules.bulkpurchase.dao;
-
-import com.caimei.modules.bulkpurchase.entity.Commissions;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-
-/**
- * Description
- *
- * @author : Charles
- * @date : 2022/3/25
- */
-@MyBatisDao
-public interface CommissionsDao extends CrudDao<Commissions> {
-
-}

src/main/java/com/caimei/modules/bulkpurchase/dao/ContractDao.java

@@ -1,20 +0,0 @@
-package com.caimei.modules.bulkpurchase.dao;
-
-import java.util.List;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.bulkpurchase.entity.Contract;
-
-/**
- * 采购信息DAO接口
- * @author jiangjunwen
- * @version 2017-03-27
- */
-@MyBatisDao
-public interface ContractDao extends CrudDao<Contract> {
-    Integer getFreePostFlagByContracId(String id);
-
-    List<Contract> getContractByNo(String no);
-
-    Double getUserMoneyByClubId(String contractId);
-}

src/main/java/com/caimei/modules/bulkpurchase/dao/ContractOrderDao.java

@@ -1,42 +0,0 @@
-package com.caimei.modules.bulkpurchase.dao;
-
-import java.util.List;
-
-import com.caimei.modules.bulkpurchase.entity.OrderBusiness;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.bulkpurchase.entity.ContractOrder;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * 采购订单DAO接口
- * @author jiangjunwen
- * @version 2017-04-07
- */
-@MyBatisDao
-public interface ContractOrderDao extends CrudDao<ContractOrder> {
-
-    List<ContractOrder> findOrder(ContractOrder contractOrder);
-
-
-    List<ContractOrder> findAllPage(ContractOrder contractOrder);
-
-    Integer updateClauseContent(ContractOrder contractOrder);
-
-    Integer selectFreePostFlag(Long contractId);
-
-    Integer findCountList(String contractId);
-
-    Integer findCompleteList(String contractId);
-
-    Integer saveConfirmFlag(ContractOrder contractOrder);
-
-    Integer updateOrderStatus(@Param("orderId")  String orderId,@Param("orderStatus")  String orderStatus);
-
-    Integer updateOrderStatusInfo(ContractOrder contractOrder);
-
-    Integer saveOrderStopInfo(ContractOrder contractOrder);
-//修改退款订单状态和金额
-    Integer saveOrderStatusFlag(ContractOrder contractOrder);
-
-}

src/main/java/com/caimei/modules/bulkpurchase/dao/OrderProductDao.java

@@ -1,45 +0,0 @@
-package com.caimei.modules.bulkpurchase.dao;
-
-import java.util.Date;
-import java.util.List;
-
-import com.caimei.modules.bulkpurchase.entity.CmFinanceReceipts;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.bulkpurchase.entity.OrderProduct;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * 订单商品DAO接口
- * @author jiangjunwen
- * @version 2017-04-07
- */
-@MyBatisDao
-public interface OrderProductDao extends CrudDao<OrderProduct> {
-
-    List<OrderProduct> findAllList(OrderProduct orderProduct);
-
-    Integer findStipulateFee(Long contractId);
-
-    int deleteByOrderId(@Param("orderId") String orderId);
-
-    List<OrderProduct> getWithorderId(String orderId);
-
-    List<OrderProduct> getWithorderIdGroupByShopId(String orderId);
-
-    Double getTotalPay(@Param("orderId")String orderId,@Param("shopId")String shopId);
-
-    Double totalOtherFee(@Param("orderId")String orderId);
-
-    Double getCmTotalPay(@Param("orderId")String orderId);
-
-    OrderProduct getProductNameByOrderproductId(String productId);
-
-    int updatePayStatus(@Param("orderProductId") String orderProductId,@Param("payStatus") String payStatus,@Param("orderPayDate") Date orderPayDate);
-
-    List<OrderProduct> findByOrderIdGroupByShopId(@Param("orderId") Integer orderId);
-
-    int updateShopConfigFlag(@Param("orderId") String orderId);
-
-}

src/main/java/com/caimei/modules/bulkpurchase/dao/OrderStagesDao.java

@@ -1,26 +0,0 @@
-package com.caimei.modules.bulkpurchase.dao;
-
-import com.caimei.modules.bulkpurchase.entity.CmClub;
-import com.caimei.modules.bulkpurchase.entity.OrderStages;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 分期订单DAO接口
- * @author Lijun
- * @version 2017-8-22
- */
-@MyBatisDao
-public interface OrderStagesDao extends CrudDao<OrderStages> {
-
-   List<OrderStages> findStagesByOrderId(@Param("orderId") String orderId);
-
-   List<OrderStages> findList(OrderStages orderStages);
-
-   int  updateStatus(OrderStages orderStages);
-
-    int deleteByOrderId(@Param("orderId")String orderId);
-}

src/main/java/com/caimei/modules/bulkpurchase/dao/OrderStagesProductDao.java

@@ -1,21 +0,0 @@
-package com.caimei.modules.bulkpurchase.dao;
-
-import com.caimei.modules.bulkpurchase.entity.OrderStagesProduct;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 分期订单商品DAO接口
- * @author Lijun
- * @version 2017-8-22
- */
-@MyBatisDao
-public interface OrderStagesProductDao extends CrudDao<OrderStagesProduct> {
-
-   List<OrderStagesProduct> findStagesProductBuyStagesId(@Param("stagesId") String stagesId);
-
-    int deleteByOrderId(@Param("orderId")String orderId);
-}

src/main/java/com/caimei/modules/bulkpurchase/dao/ProductPrivilegeDao.java

@@ -1,19 +0,0 @@
-package com.caimei.modules.bulkpurchase.dao;
-
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.bulkpurchase.entity.ProductPrivilege;
-
-import java.util.List;
-
-/**
- * 赠送优惠信息DAO接口
- * @author jiangjunwen
- * @version 2017-03-31
- */
-@MyBatisDao
-public interface ProductPrivilegeDao extends CrudDao<ProductPrivilege> {
-
-    List<ProductPrivilege> findListByProductId(String contractProductId);
-
-}

src/main/java/com/caimei/modules/bulkpurchase/dao/PurchaseProductDao.java

@@ -1,39 +0,0 @@
-package com.caimei.modules.bulkpurchase.dao;
-
-import com.caimei.modules.product.entity.CmSku;
-import com.caimei.modules.svip.entity.CmSvipProduct;
-import com.caimei.po.ProductLadderPrice;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.bulkpurchase.entity.PurchaseProduct;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 大宗采购商品信息DAO接口
- * @author jiangjunwen
- * @version 2017-03-28
- */
-@MyBatisDao
-public interface PurchaseProductDao extends CrudDao<PurchaseProduct> {
-
-    List<PurchaseProduct> getPurchaseProductByCtId(long contractId);
-
-    /**
-     * 二手商品列表
-     * @param purchaseProduct
-     * @return
-     */
-    List<PurchaseProduct> findSencondProductPage(PurchaseProduct purchaseProduct);
-
-
-    Integer findCount(String contractId );
-
-    List<ProductLadderPrice> findLadderPriceList(Long productId);
-
-    CmSvipProduct getSvipProduct(@Param("productId")Long productId, @Param("userId") Integer userId);
-
-    CmSku findVipSku(Long productId);
-}

src/main/java/com/caimei/modules/bulkpurchase/dao/ReceiptListDao.java

@@ -1,14 +0,0 @@
-package com.caimei.modules.bulkpurchase.dao;
-
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.bulkpurchase.entity.ReceiptList;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-/**
- * 收款列表DAO
- * @author lijun
- * @version 2017-06-05
- */
-@MyBatisDao
-public interface ReceiptListDao extends CrudDao<ReceiptList> {
-
-}

src/main/java/com/caimei/modules/bulkpurchase/dao/ShouldPayDao.java

@@ -1,26 +0,0 @@
-package com.caimei.modules.bulkpurchase.dao;
-
-import com.caimei.modules.bulkpurchase.entity.ShouldPay;
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-
-/**
- * 应付列表DAO接口
- * @author ZCP
- * @version 2017-06-06
- */
-@MyBatisDao
-public interface ShouldPayDao extends CrudDao<ShouldPay> {
-
-    /*List<ContractOrder> findOrder(ContractOrder contractOrder);
-
-    List<ContractOrder> findAllPage(ContractOrder contractOrder);
-
-    Integer selectFreePostFlag(Long contractId);
-
-    Integer findCountList(String contractId);
-
-    Integer findCompleteList(String contractId);
-
-    Integer saveConfirmFlag(ContractOrder contractOrder);*/
-}

src/main/java/com/caimei/modules/bulkpurchase/dao/TransactionDao.java

@@ -1,26 +0,0 @@
-package com.caimei.modules.bulkpurchase.dao;
-
-import com.thinkgem.jeesite.common.persistence.CrudDao;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
-import com.caimei.modules.bulkpurchase.entity.Transaction;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-/**
- * 老订单交易信息DAO接口
- * @author lijun
- * @version 2018-09-21
- */
-@MyBatisDao
-public interface TransactionDao extends CrudDao<Transaction> {
-
-    Transaction get(String id);
-
-    List<Transaction> findList(Transaction transaction);
-
-    Page<Transaction> findPage(Page<Transaction> page, Transaction transaction);
-
-    void save(Transaction transaction);
-}

src/main/java/com/caimei/modules/bulkpurchase/entity/BpOrderCirculation.java

@@ -1,96 +0,0 @@
-package com.caimei.modules.bulkpurchase.entity;
-
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-
-/**
- * .订单传阅
- *
- * @author ZCP
- * @version 2017-08-03
- **/
-public class BpOrderCirculation extends DataEntity<BpOrderCirculation> {
-
-    private static final long serialVersionUID = 1L;
-    private Long userId;		// userId
-    private String buyerRole;  //买家订单传阅
-    private String shopRole;   //供应商订单传阅
-    private String addTime;		// 添加时间
-    private String updateTime;		// 修改时间
-
-    private String mobile;      //手机号码
-    private String userName;    //用户名
-    private String userTypeName; //用户类型名称
-    private String userType;//
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public String getAddTime() {
-        return addTime;
-    }
-
-    public void setAddTime(String addTime) {
-        this.addTime = addTime;
-    }
-
-    public String getMobile() {
-        return mobile;
-    }
-
-    public void setMobile(String mobile) {
-        this.mobile = mobile;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public String getUserTypeName() {
-        return userTypeName;
-    }
-
-    public void setUserTypeName(String userTypeName) {
-        this.userTypeName = userTypeName;
-    }
-
-    public String getBuyerRole() {
-        return buyerRole;
-    }
-
-    public void setBuyerRole(String buyerRole) {
-        this.buyerRole = buyerRole;
-    }
-
-    public String getShopRole() {
-        return shopRole;
-    }
-
-    public void setShopRole(String shopRole) {
-        this.shopRole = shopRole;
-    }
-
-    public String getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(String updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getUserType() {
-        return userType;
-    }
-
-    public void setUserType(String userType) {
-        this.userType = userType;
-    }
-}

src/main/java/com/caimei/modules/bulkpurchase/entity/BpOrderProductRemark.java

@@ -1,58 +0,0 @@
-package com.caimei.modules.bulkpurchase.entity;
-
-
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-
-/**
- * 大宗采购订单商品备注Entity
- * @author LiJun
- * @version 2018-04-03
- */
-public class BpOrderProductRemark extends DataEntity<BpOrderProductRemark> {
-	
-	private static final long serialVersionUID = 1L;
-	private Integer orderProductId;		// 订单商品ID
-	private Integer stagesId;
-	private String sysUserName;//系统用户名字
-	private String no;//系统用户代号
-
-	public BpOrderProductRemark() {
-		super();
-	}
-
-	public BpOrderProductRemark(String id){
-		super(id);
-	}
-
-	public Integer getOrderProductId() {
-		return orderProductId;
-	}
-
-	public void setOrderProductId(Integer orderProductId) {
-		this.orderProductId = orderProductId;
-	}
-
-	public String getSysUserName() {
-		return sysUserName;
-	}
-
-	public void setSysUserName(String sysUserName) {
-		this.sysUserName = sysUserName;
-	}
-
-	public String getNo() {
-		return no;
-	}
-
-	public void setNo(String no) {
-		this.no = no;
-	}
-
-	public Integer getStagesId() {
-		return stagesId;
-	}
-
-	public void setStagesId(Integer stagesId) {
-		this.stagesId = stagesId;
-	}
-}

src/main/java/com/caimei/modules/bulkpurchase/entity/BpOrderRemark.java

@@ -1,49 +0,0 @@
-package com.caimei.modules.bulkpurchase.entity;
-
-
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-
-/**
- * 大宗采购订单备注Entity
- * @author LiJun
- * @version 2018-04-12
- */
-public class BpOrderRemark extends DataEntity<BpOrderRemark> {
-	
-	private static final long serialVersionUID = 1L;
-	private Integer orderId;		// 订单ID
-	private String sysUserName;//系统用户名字
-	private String no;//系统用户代号
-
-	public BpOrderRemark() {
-		super();
-	}
-
-	public BpOrderRemark(String id){
-		super(id);
-	}
-
-	public Integer getOrderId() {
-		return orderId;
-	}
-
-	public void setOrderId(Integer orderId) {
-		this.orderId = orderId;
-	}
-
-	public String getSysUserName() {
-		return sysUserName;
-	}
-
-	public void setSysUserName(String sysUserName) {
-		this.sysUserName = sysUserName;
-	}
-
-	public String getNo() {
-		return no;
-	}
-
-	public void setNo(String no) {
-		this.no = no;
-	}
-}

src/main/java/com/caimei/modules/bulkpurchase/entity/BpOrderVo.java

@@ -1,124 +0,0 @@
-package com.caimei.modules.bulkpurchase.entity;
-
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 订单列表的导出实体类
- * @author zcp
- * @version 2018-04-17
- */
-public class BpOrderVo extends DataEntity<BpOrderVo> {
-
-    private static final long serialVersionUID = 1L;
-    private String stagesFlag;      //分期标志
-    private Date orderTime;       //订单时间
-    private Integer orderId;        // 订单ID
-    private String no;              // 订单号
-    private String payTotalFee;     // 实付总额(应付)
-    private String name;            //会所名
-    private String received;        //已收
-    private String uncollected;     //未收
-    private String shouldPayShop;   //应付供应商合计
-    private String unPayShop;       //未付供应商合计
-    private String alreadyPayCm;    //采美佣金（已付采美）
-    private String stagesNum;       //分期才有第几期
-
-    public Date getOrderTime() {
-        return orderTime;
-    }
-
-    public void setOrderTime(Date orderTime) {
-        this.orderTime = orderTime;
-    }
-
-    public Integer getOrderId() {
-        return orderId;
-    }
-
-    public void setOrderId(Integer orderId) {
-        this.orderId = orderId;
-    }
-
-    public String getNo() {
-        return no;
-    }
-
-    public void setNo(String no) {
-        this.no = no;
-    }
-
-    public String getPayTotalFee() {
-        return payTotalFee;
-    }
-
-    public void setPayTotalFee(String payTotalFee) {
-        this.payTotalFee = payTotalFee;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getReceived() {
-        return received;
-    }
-
-    public void setReceived(String received) {
-        this.received = received;
-    }
-
-    public String getUncollected() {
-        return uncollected;
-    }
-
-    public void setUncollected(String uncollected) {
-        this.uncollected = uncollected;
-    }
-
-    public String getShouldPayShop() {
-        return shouldPayShop;
-    }
-
-    public void setShouldPayShop(String shouldPayShop) {
-        this.shouldPayShop = shouldPayShop;
-    }
-
-    public String getUnPayShop() {
-        return unPayShop;
-    }
-
-    public void setUnPayShop(String unPayShop) {
-        this.unPayShop = unPayShop;
-    }
-
-    public String getAlreadyPayCm() {
-        return alreadyPayCm;
-    }
-
-    public void setAlreadyPayCm(String alreadyPayCm) {
-        this.alreadyPayCm = alreadyPayCm;
-    }
-
-    public String getStagesNum() {
-        return stagesNum;
-    }
-
-    public void setStagesNum(String stagesNum) {
-        this.stagesNum = stagesNum;
-    }
-
-    public String getStagesFlag() {
-        return stagesFlag;
-    }
-
-    public void setStagesFlag(String stagesFlag) {
-        this.stagesFlag = stagesFlag;
-    }
-}

src/main/java/com/caimei/modules/bulkpurchase/entity/Commissions.java

@@ -1,80 +0,0 @@
-package com.caimei.modules.bulkpurchase.entity;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-
-import java.util.Date;
-
-/**
- * Description
- *
- * @author : Charles
- * @date : 2022/3/25
- */
-public class Commissions extends DataEntity<Commissions> {
-    private String id;
-    //订单表id
-    private String orderId;
-    //记录人
-    private String name;
-    //创建时间
-    private Date addTime;
-    //提成情况
-    private String sales;
-    //备注
-    private String script;
-
-    @Override
-    public String getId() {
-        return id;
-    }
-
-    @Override
-    public void setId(String id) {
-        this.id = id;
-    }
-
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-
-
-    public String getSales() {
-        return sales;
-    }
-
-    public void setSales(String sales) {
-        this.sales = sales;
-    }
-
-    public String getScript() {
-        return script;
-    }
-
-    public void setScript(String script) {
-        this.script = script;
-    }
-
-    public String getOrderId() {
-        return orderId;
-    }
-
-    public void setOrderId(String orderId) {
-        this.orderId = orderId;
-    }
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    public Date getAddTime() {
-        return addTime;
-    }
-
-    public void setAddTime(Date addTime) {
-        this.addTime = addTime;
-    }
-}

src/main/java/com/caimei/modules/bulkpurchase/entity/ContractOrder.java

@@ -1,561 +0,0 @@
-package com.caimei.modules.bulkpurchase.entity;
-
-import com.caimei.modules.project.entity.Clubsubbranch;
-import com.google.common.collect.Lists;
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-import org.hibernate.validator.constraints.Length;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 采购订单Entity
- * @author jiangjunwen
- * @version 2017-04-07
- */
-public class ContractOrder extends DataEntity<ContractOrder> {
-	
-	private static final long serialVersionUID = 1L;
-	private Long clubId;		// 会所ID
-	private String contractId;		// 采购ID
-	private String no;		// 订单号
-	private String status;		// 订单状态
-	private String payWay;		// 支付方式
-	private String orderSource;		// 订单来源 1、网站  2、CRM 3、APP 4、后台
-	private String productCount;		// 商品总数
-	private String presentCount;		// 赠送总数
-	private String productTotalFee;		// 商品总额
-	private String orderTotalFee;		// 订单总额
-	private String payTotalFee;		// 实付总额(应付)
-	private String balancePayFee;		// 余额支付总额
-	private String freePostFlag;		// 0包邮,1到付
-	private String freight;		// 运费
-	private String discount;		// 折扣
-	/**库分期20180427*/
-	private String cooFreeFlag;		//免息标志
-	private Integer cooFreeRate;	//库分期免息费率
-	private String cooFreeAmount;	//库分期免息金额 = 订单总额 * feilv /100
-
-	private String confirmFlag;   // 订单确认标记 0否 1是
-	private String userMoney;
-	private BpOrderUserinfo bpOrderUserinfo;
-	private List<OrderProduct> orderProduct;
-	private OrderInvoice orderInvoice;
-	private String startTime;
-	private String endTime;
-	private String name;
-	private String image;//图片
-	private String num;
-	private String shouHuoRen; //收货人
-	private String orderUserInfoId;
-	private String orderInvoiceId;//订单发票ID
-	private String orderProductId;//订单产品ID
-	private  List<Clubsubbranch> clubsubbranchList;
-	private Contract contract; // 采购信息
-	private String flag;//1：订单查询页面的订单详情，删除等入口 2：采购信息的页面订单详情，删除等入口
-	private String stagesFlag;// 是否是分期订单 分期标志0否 1是
-	private String stagesRemarks;// 分期备注
-	private Long clauseId;// 条款ID
-	private Long spId;// 创客ID
-	private Integer stagesNum;//分期数
-	private String orderStopFlag;//订单终止标志
-	private String orderStopRemarks;//订单终止备注
-	private List<OrderStages> orderStages= Lists.newArrayList();//分期信息
-	private String shopNameInfo ;
-	private BigDecimal stagesTotalFee; //分期总金额
-	private String clauseContent;//条款内容
-	private String clauseType;//条款启用类型 （0,1,2:都启用）
-	private String clauseName; //条款名称
-	private String refundsAmount;//订单退款金额
-	private String orderStatusFlag;//1:非退货退款订单、2：退货退款中、3退货退款完成
-	private Date updateDate;//更新时间
-
-	//添加订单收款信息统计
-	private String received;//已收
-	private String uncollected;//未收
-	private String stagesReceived;//分期已收
-	private String stagesUncollected;//分期未收
-	private String alreadyPay;            //已付
-	private String unPay;                 //未付
-	private String alreadyPayCm;//采美佣金（已付采美）
-	private String buyAgainFlag;//订单是否为再次购买订单 0否 1是
-
-	public String getClauseName() {return clauseName;}
-
-	public void setClauseName(String clauseName) {this.clauseName = clauseName;}
-
-	public String getOrderStatusFlag() {return orderStatusFlag;}
-
-	public void setOrderStatusFlag(String orderStatusFlag) {this.orderStatusFlag = orderStatusFlag;}
-
-	public String getRefundsAmount() {return refundsAmount;}
-
-	public void setRefundsAmount(String refundsAmount) {this.refundsAmount = refundsAmount;}
-
-	public String getClauseType() {
-		return clauseType;
-	}
-	public void setClauseType(String clauseType) {
-		this.clauseType = clauseType;
-	}
-
-	public String getOrderStopFlag() {
-		return orderStopFlag;
-	}
-
-	public void setOrderStopFlag(String orderStopFlag) {
-		this.orderStopFlag = orderStopFlag;
-	}
-
-	public String getOrderStopRemarks() {
-		return orderStopRemarks;
-	}
-
-	public void setOrderStopRemarks(String orderStopRemarks) {
-		this.orderStopRemarks = orderStopRemarks;
-	}
-
-	public String getStagesFlag() {
-		return stagesFlag;
-	}
-
-	public void setStagesFlag(String stagesFlag) {
-		this.stagesFlag = stagesFlag;
-	}
-
-	public Contract getContract() {
-		return contract;
-	}
-
-	public void setContract(Contract contract) {
-		this.contract = contract;
-	}
-
-	public ContractOrder() {
-		super();
-	}
-
-
-	public String getFlag() {
-		return flag;
-	}
-
-	public void setFlag(String flag) {
-		this.flag = flag;
-	}
-
-	public String getOrderProductId() {
-		return orderProductId;
-	}
-
-	public void setOrderProductId(String orderProductId) {
-		this.orderProductId = orderProductId;
-	}
-
-	public String getOrderInvoiceId() {
-		return orderInvoiceId;
-	}
-
-	public void setOrderInvoiceId(String orderInvoiceId) {
-		this.orderInvoiceId = orderInvoiceId;
-	}
-
-	public String getOrderUserInfoId() {
-		return orderUserInfoId;
-	}
-
-	public void setOrderUserInfoId(String orderUserInfoId) {
-		this.orderUserInfoId = orderUserInfoId;
-	}
-
-	public List<Clubsubbranch> getClubsubbranchList() {
-		return clubsubbranchList;
-	}
-
-	public String getUserMoney() {
-		return userMoney;
-	}
-
-	public void setUserMoney(String userMoney) {
-		this.userMoney = userMoney;
-	}
-
-	public void setClubsubbranchList(List<Clubsubbranch> clubsubbranchList) {
-		this.clubsubbranchList = clubsubbranchList;
-	}
-
-	public ContractOrder(String id){
-		super(id);
-	}
-
-	public OrderInvoice getOrderInvoice() {
-		return orderInvoice;
-	}
-
-	public void setOrderInvoice(OrderInvoice orderInvoice) {
-		this.orderInvoice = orderInvoice;
-	}
-
-	public Long getClubId() {
-		return clubId;
-	}
-
-	public void setClubId(Long clubId) {
-		this.clubId = clubId;
-	}
-	
-	public String getContractId() {
-		return contractId;
-	}
-
-	public void setContractId(String contractId) {
-		this.contractId = contractId;
-	}
-	
-	@Length(min=0, max=30, message="订单号长度必须介于 0 和 30 之间")
-	public String getNo() {
-		return no;
-	}
-
-	public BpOrderUserinfo getBpOrderUserinfo() {
-		return bpOrderUserinfo;
-	}
-
-	public void setBpOrderUserinfo(BpOrderUserinfo bpOrderUserinfo) {
-		this.bpOrderUserinfo = bpOrderUserinfo;
-	}
-
-	public List<OrderProduct> getOrderProduct() {
-		return orderProduct;
-	}
-
-	public void setOrderProduct(List<OrderProduct> orderProduct) {
-		this.orderProduct = orderProduct;
-	}
-
-	public void setNo(String no) {
-		this.no = no;
-	}
-	
-	@Length(min=0, max=11, message="订单状态长度必须介于 0 和 11 之间")
-	public String getStatus() {
-		return status;
-	}
-
-	public void setStatus(String status) {
-		this.status = status;
-	}
-	
-	@Length(min=0, max=11, message="支付方式长度必须介于 0 和 11 之间")
-	public String getPayWay() {
-		return payWay;
-	}
-
-	public void setPayWay(String payWay) {
-		this.payWay = payWay;
-	}
-	
-	@Length(min=0, max=1, message="订单来源 1、网站  2、CRM 3、APP 4、后台长度必须介于 0 和 1 之间")
-	public String getOrderSource() {
-		return orderSource;
-	}
-
-	public void setOrderSource(String orderSource) {
-		this.orderSource = orderSource;
-	}
-	
-	@Length(min=0, max=11, message="商品总数长度必须介于 0 和 11 之间")
-	public String getProductCount() {
-		return productCount;
-	}
-
-	public void setProductCount(String productCount) {
-		this.productCount = productCount;
-	}
-	
-	@Length(min=0, max=11, message="赠送总数长度必须介于 0 和 11 之间")
-	public String getPresentCount() {
-		return presentCount;
-	}
-
-	public void setPresentCount(String presentCount) {
-		this.presentCount = presentCount;
-	}
-	
-	public String getProductTotalFee() {
-		return productTotalFee;
-	}
-
-	public void setProductTotalFee(String productTotalFee) {
-		this.productTotalFee = productTotalFee;
-	}
-	
-	public String getOrderTotalFee() {
-		return orderTotalFee;
-	}
-
-	public void setOrderTotalFee(String orderTotalFee) {
-		this.orderTotalFee = orderTotalFee;
-	}
-	
-	public String getPayTotalFee() {
-		return payTotalFee;
-	}
-
-	public void setPayTotalFee(String payTotalFee) {
-		this.payTotalFee = payTotalFee;
-	}
-	
-	public String getBalancePayFee() {
-		return balancePayFee;
-	}
-
-	public void setBalancePayFee(String balancePayFee) {
-		this.balancePayFee = balancePayFee;
-	}
-	
-	@Length(min=0, max=1, message="0包邮,1到付长度必须介于 0 和 1 之间")
-	public String getFreePostFlag() {
-		return freePostFlag;
-	}
-
-	public void setFreePostFlag(String freePostFlag) {
-		this.freePostFlag = freePostFlag;
-	}
-	
-	public String getFreight() {
-		return freight;
-	}
-
-	public void setFreight(String freight) {
-		this.freight = freight;
-	}
-	
-	public String getDiscount() {
-		return discount;
-	}
-
-	public void setDiscount(String discount) {
-		this.discount = discount;
-	}
-
-	public String getStartTime() {
-		return startTime;
-	}
-
-	public void setStartTime(String startTime) {
-		this.startTime = startTime;
-	}
-
-	public String getEndTime() {
-		return endTime;
-	}
-
-	public void setEndTime(String endTime) {
-		this.endTime = endTime;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public String getImage() {
-		return image;
-	}
-
-	public void setImage(String image) {
-		this.image = image;
-	}
-
-	public String getNum() {
-		return num;
-	}
-
-	public void setNum(String num) {
-		this.num = num;
-	}
-
-	public String getShouHuoRen() {
-		return shouHuoRen;
-	}
-
-	public void setShouHuoRen(String shouHuoRen) {
-		this.shouHuoRen = shouHuoRen;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-
-	public String getConfirmFlag() {
-		return confirmFlag;
-	}
-
-	public void setConfirmFlag(String confirmFlag) {
-		this.confirmFlag = confirmFlag;
-	}
-
-	public Long getClauseId() {
-		return clauseId;
-	}
-
-	public void setClauseId(Long clauseId) {
-		this.clauseId = clauseId;
-	}
-
-	public Long getSpId() {
-		return spId;
-	}
-
-	public void setSpId(Long spId) {
-		this.spId = spId;
-	}
-
-	public List<OrderStages> getOrderStages() {
-		return orderStages;
-	}
-
-	public void setOrderStages(List<OrderStages> orderStages) {
-		this.orderStages = orderStages;
-	}
-
-	public Integer getStagesNum() {
-		return stagesNum;
-	}
-
-	public void setStagesNum(Integer stagesNum) {
-		this.stagesNum = stagesNum;
-	}
-
-	public String getStagesRemarks() {
-		return stagesRemarks;
-	}
-
-	public void setStagesRemarks(String stagesRemarks) {
-		this.stagesRemarks = stagesRemarks;
-	}
-
-	public String getShopNameInfo() {
-		return shopNameInfo;
-	}
-
-	public void setShopNameInfo(String shopNameInfo) {
-		this.shopNameInfo = shopNameInfo;
-	}
-
-	public BigDecimal getStagesTotalFee() {
-		return stagesTotalFee;
-	}
-
-	public void setStagesTotalFee(BigDecimal stagesTotalFee) {
-		this.stagesTotalFee = stagesTotalFee;
-	}
-
-	public String getClauseContent() {
-		return clauseContent;
-	}
-
-	public void setClauseContent(String clauseContent) {
-		this.clauseContent = clauseContent;
-	}
-
-	public String getReceived() {
-		return received;
-	}
-
-	public void setReceived(String received) {
-		this.received = received;
-	}
-
-	public String getUncollected() {
-		return uncollected;
-	}
-
-	public void setUncollected(String uncollected) {
-		this.uncollected = uncollected;
-	}
-
-	public String getStagesReceived() {
-		return stagesReceived;
-	}
-
-	public void setStagesReceived(String stagesReceived) {
-		this.stagesReceived = stagesReceived;
-	}
-
-	public String getStagesUncollected() {
-		return stagesUncollected;
-	}
-
-	public void setStagesUncollected(String stagesUncollected) {
-		this.stagesUncollected = stagesUncollected;
-	}
-
-	public String getAlreadyPay() {
-		return alreadyPay;
-	}
-
-	public void setAlreadyPay(String alreadyPay) {
-		this.alreadyPay = alreadyPay;
-	}
-
-	public String getUnPay() {
-		return unPay;
-	}
-
-	public void setUnPay(String unPay) {
-		this.unPay = unPay;
-	}
-
-	public String getAlreadyPayCm() {
-		return alreadyPayCm;
-	}
-
-	public void setAlreadyPayCm(String alreadyPayCm) {
-		this.alreadyPayCm = alreadyPayCm;
-	}
-
-	@Override
-	public Date getUpdateDate() {
-		return updateDate;
-	}
-
-	@Override
-	public void setUpdateDate(Date updateDate) {
-		this.updateDate = updateDate;
-	}
-
-	public String getCooFreeFlag() {
-		return cooFreeFlag;
-	}
-
-	public void setCooFreeFlag(String cooFreeFlag) {
-		this.cooFreeFlag = cooFreeFlag;
-	}
-
-	public Integer getCooFreeRate() {
-		return cooFreeRate;
-	}
-
-	public void setCooFreeRate(Integer cooFreeRate) {
-		this.cooFreeRate = cooFreeRate;
-	}
-
-	public String getCooFreeAmount() {
-		return cooFreeAmount;
-	}
-
-	public void setCooFreeAmount(String cooFreeAmount) {
-		this.cooFreeAmount = cooFreeAmount;
-	}
-
-	public String getBuyAgainFlag() {
-		return buyAgainFlag;
-	}
-
-	public void setBuyAgainFlag(String buyAgainFlag) {
-		this.buyAgainFlag = buyAgainFlag;
-	}
-}

src/main/java/com/caimei/modules/bulkpurchase/entity/OrderBusiness.java

@@ -1,40 +0,0 @@
-package com.caimei.modules.bulkpurchase.entity;
-
-import com.caimei.modules.bulkpurchase.entity.ContractOrder;
-
-import java.util.Date;
-
-/**
- * Created by 822 on 2017/4/10.
- */
-public class OrderBusiness extends ContractOrder {
-
-    private String name;
-
-    private String orderStutes;
-    private String orderSourceStr;
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-
-    public String getOrderStutes() {
-        return orderStutes;
-    }
-
-    public void setOrderStutes(String orderStutes) {
-        this.orderStutes = orderStutes;
-    }
-
-    public String getOrderSourceStr() {
-        return orderSourceStr;
-    }
-
-    public void setOrderSourceStr(String orderSourceStr) {
-        this.orderSourceStr = orderSourceStr;
-    }
-}

src/main/java/com/caimei/modules/bulkpurchase/entity/ReceiptList.java

@@ -1,319 +0,0 @@
-package com.caimei.modules.bulkpurchase.entity;
-
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 收款列表Entity
- * @author lijun
- * @version 2017-06-05
- */
-public class ReceiptList extends DataEntity<ReceiptList> {
-    private static final long serialVersionUID = 1L;
-    private Long orderId;		// 订单ID
-    private String orderNo;		// 订单号
-    private Date createDate;// 下单时间
-    private String clubId;//会所ID
-    private String payTotalFee;//应收合计
-    private String received;//已收
-    private String uncollected;//未收
-    private String productTypeNum;//商品种类
-    private String unProductTypeNum;//未付款商品种类
-    private String reviewProductTypeNum;// 待审核商品种类数（未审核的勾选过已进账商品数。）
-    private String reviewFailureNum;//审核通过.1.是 2.不是
-    private String startTime;		// 下订单开始时间
-    private String endTime;		// 下订单截止时间
-    private String clubName;//会所名
-    private String clubAddress;//会所地址
-    private String clubMobile;//会所手机
-    private List<OrderProduct> orderProductList;// 订单产品集合
-    private List<OrderStages> orderStagesList;// 分期订单List
-    private String confirmFlag;//确认订单
-
-    //提供收款列表中进账确认弹窗保存参数
-    private String payType;//支付方式
-    private String transactionNum;//交易单号
-    private Date receiptsDate;//输入的进账时间
-    private String shouldPayAmount;//实付金额
-    private String flag;// 1表示进账确认
-    //分期参数
-    private String stagesNum;// 分期数
-    private String unStagesNum;// 未付款分期数
-    private String reviewStagesNum;// 待审核分期数
-    private String stagesFlag;// 分期标志0否 1是
-    private String stagesReceived;//分期已收
-    private String stagesUncollected;//分期未收
-    private String orderStopFlag;//订单终止标志
-    private String orderStopRemarks;//订单终止备注
-    private String stagesRemarks;// 分期备注(银行卡以及账号信息)
-
-
-    public String getConfirmFlag() {
-        return confirmFlag;
-    }
-
-    public void setConfirmFlag(String confirmFlag) {
-        this.confirmFlag = confirmFlag;
-    }
-
-    public String getStagesRemarks() {
-        return stagesRemarks;
-    }
-
-    public void setStagesRemarks(String stagesRemarks) {
-        this.stagesRemarks = stagesRemarks;
-    }
-
-    public String getOrderStopFlag() {
-        return orderStopFlag;
-    }
-
-    public void setOrderStopFlag(String orderStopFlag) {
-        this.orderStopFlag = orderStopFlag;
-    }
-
-    public String getOrderStopRemarks() {
-        return orderStopRemarks;
-    }
-
-    public void setOrderStopRemarks(String orderStopRemarks) {
-        this.orderStopRemarks = orderStopRemarks;
-    }
-
-    public String getStagesReceived() {
-        return stagesReceived;
-    }
-
-    public void setStagesReceived(String stagesReceived) {
-        this.stagesReceived = stagesReceived;
-    }
-
-    public String getStagesUncollected() {
-        return stagesUncollected;
-    }
-
-    public void setStagesUncollected(String stagesUncollected) {
-        this.stagesUncollected = stagesUncollected;
-    }
-
-    public List<OrderStages> getOrderStagesList() {
-        return orderStagesList;
-    }
-
-    public void setOrderStagesList(List<OrderStages> orderStagesList) {
-        this.orderStagesList = orderStagesList;
-    }
-
-    public String getStagesFlag() {
-        return stagesFlag;
-    }
-
-    public void setStagesFlag(String stagesFlag) {
-        this.stagesFlag = stagesFlag;
-    }
-
-    public String getStagesNum() {
-        return stagesNum;
-    }
-
-    public void setStagesNum(String stagesNum) {
-        this.stagesNum = stagesNum;
-    }
-
-    public String getUnStagesNum() {
-        return unStagesNum;
-    }
-
-    public void setUnStagesNum(String unStagesNum) {
-        this.unStagesNum = unStagesNum;
-    }
-
-    public String getReviewStagesNum() {
-        return reviewStagesNum;
-    }
-
-    public void setReviewStagesNum(String reviewStagesNum) {
-        this.reviewStagesNum = reviewStagesNum;
-    }
-
-    public String getFlag() {
-        return flag;
-    }
-
-    public void setFlag(String flag) {
-        this.flag = flag;
-    }
-
-    public String getShouldPayAmount() {
-        return shouldPayAmount;
-    }
-
-    public void setShouldPayAmount(String shouldPayAmount) {
-        this.shouldPayAmount = shouldPayAmount;
-    }
-
-    public String getPayType() {
-        return payType;
-    }
-
-    public void setPayType(String payType) {
-        this.payType = payType;
-    }
-
-    public String getTransactionNum() {
-        return transactionNum;
-    }
-
-    public void setTransactionNum(String transactionNum) {
-        this.transactionNum = transactionNum;
-    }
-
-    public Date getReceiptsDate() {
-        return receiptsDate;
-    }
-
-    public void setReceiptsDate(Date receiptsDate) {
-        this.receiptsDate = receiptsDate;
-    }
-
-    public String getClubAddress() {
-        return clubAddress;
-    }
-
-    public void setClubAddress(String clubAddress) {
-        this.clubAddress = clubAddress;
-    }
-
-    public String getClubMobile() {
-        return clubMobile;
-    }
-
-    public void setClubMobile(String clubMobile) {
-        this.clubMobile = clubMobile;
-    }
-
-
-    public List<OrderProduct> getOrderProductList() {
-        return orderProductList;
-    }
-
-    public void setOrderProductList(List<OrderProduct> orderProductList) {
-        this.orderProductList = orderProductList;
-    }
-
-    public String getProductTypeNum() {
-        return productTypeNum;
-    }
-
-    public void setProductTypeNum(String productTypeNum) {
-        this.productTypeNum = productTypeNum;
-    }
-
-    public String getUncollected() {
-        return uncollected;
-    }
-
-    public void setUncollected(String uncollected) {
-        this.uncollected = uncollected;
-    }
-
-    public String getUnProductTypeNum() {
-        return unProductTypeNum;
-    }
-
-    public void setUnProductTypeNum(String unProductTypeNum) {
-        this.unProductTypeNum = unProductTypeNum;
-    }
-
-    public String getReviewProductTypeNum() {
-        return reviewProductTypeNum;
-    }
-
-    public void setReviewProductTypeNum(String reviewProductTypeNum) {
-        this.reviewProductTypeNum = reviewProductTypeNum;
-    }
-
-    public String getReviewFailureNum() {
-        return reviewFailureNum;
-    }
-
-    public void setReviewFailureNum(String reviewFailureNum) {
-        this.reviewFailureNum = reviewFailureNum;
-    }
-
-    public String getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(String startTime) {
-        this.startTime = startTime;
-    }
-
-    public String getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(String endTime) {
-        this.endTime = endTime;
-    }
-    public String getOrderNo() {
-        return orderNo;
-    }
-
-    public void setOrderNo(String orderNo) {
-        this.orderNo = orderNo;
-    }
-
-    public String getClubName() {
-        return clubName;
-    }
-
-    public void setClubName(String clubName) {
-        this.clubName = clubName;
-    }
-
-    public Long getOrderId() {
-        return orderId;
-    }
-
-    public void setOrderId(Long orderId) {
-        this.orderId = orderId;
-    }
-
-    public String getClubId() {
-        return clubId;
-    }
-
-    public void setClubId(String clubId) {
-        this.clubId = clubId;
-    }
-
-    public String getPayTotalFee() {
-        return payTotalFee;
-    }
-
-    public void setPayTotalFee(String payTotalFee) {
-        this.payTotalFee = payTotalFee;
-    }
-
-    public String getReceived() {
-        return received;
-    }
-
-    public void setReceived(String received) {
-        this.received = received;
-    }
-
-    @Override
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    @Override
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-}

src/main/java/com/caimei/modules/bulkpurchase/entity/ShouldPay.java

@@ -39,7 +39,6 @@ public class ShouldPay extends DataEntity<ShouldPay> {
     private OrderProduct orderProduct;  //单个商品订单
     // 分期订单参数
     private String stagesFlag;// 分期标志0否 1是
-    private List<OrderStages> orderStagesList;// 分期订单List
     private String stagesReceived;//分期已收
     private String stagesUncollected;//分期未收
     private String orderStopFlag;//订单终止标志
@@ -100,14 +99,6 @@ public class ShouldPay extends DataEntity<ShouldPay> {
         this.stagesUncollected = stagesUncollected;
     }
 
-    public List<OrderStages> getOrderStagesList() {
-        return orderStagesList;
-    }
-
-    public void setOrderStagesList(List<OrderStages> orderStagesList) {
-        this.orderStagesList = orderStagesList;
-    }
-
     public String getStagesFlag() {
         return stagesFlag;
     }

src/main/java/com/caimei/modules/bulkpurchase/entity/StagesShopFee.java

@@ -1,56 +0,0 @@
-package com.caimei.modules.bulkpurchase.entity;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- * @author zcp
- * @date 2018/4/11
- * @time 17:51
- * @description:
- **/
-public class StagesShopFee implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private Integer shopId;
-    private BigDecimal shopFee;
-    private BigDecimal maxShopFee;
-
-    public StagesShopFee() {
-    }
-
-    public StagesShopFee(Integer shopId, BigDecimal shopFee) {
-        this.shopId = shopId;
-        this.shopFee = shopFee;
-    }
-
-    public StagesShopFee(Integer shopId, BigDecimal shopFee, BigDecimal maxShopFee) {
-        this.shopId = shopId;
-        this.shopFee = shopFee;
-        this.maxShopFee = maxShopFee;
-    }
-
-    public Integer getShopId() {
-        return shopId;
-    }
-
-    public void setShopId(Integer shopId) {
-        this.shopId = shopId;
-    }
-
-    public BigDecimal getShopFee() {
-        return shopFee;
-    }
-
-    public void setShopFee(BigDecimal shopFee) {
-        this.shopFee = shopFee;
-    }
-
-    public BigDecimal getMaxShopFee() {
-        return maxShopFee;
-    }
-
-    public void setMaxShopFee(BigDecimal maxShopFee) {
-        this.maxShopFee = maxShopFee;
-    }
-}

src/main/java/com/caimei/modules/bulkpurchase/entity/Transaction.java

@@ -1,365 +0,0 @@
-package com.caimei.modules.bulkpurchase.entity;
-
-import org.hibernate.validator.constraints.Length;
-
-import com.thinkgem.jeesite.common.persistence.DataEntity;
-
-/**
- * 老订单交易信息Entity
- * @author lijun
- * @version 2018-09-21
- */
-public class Transaction extends DataEntity<Transaction> {
-	
-	private static final long serialVersionUID = 1L;
-	private String transactionID;		// transactionID
-	private String transactionWayID;		// 交易方式：见表c_transactionway
-	private String transactionTypeID;		// 交易类型：见表c_transactiontype
-	private String payTypeID;		// 支付方式
-	private String title;		// 描述
-	private String amount;		// 金额
-	private String actualAmount;		// 支付金额
-	private String addTime;		// 创建时间
-	private String payTime;		// 支付时间
-	private String transactionNum;		// 交易号
-	private String relateID;		// 关联订单号（单个订单）
-	private String status;		// 交易状态：见表c_transactionstatus或枚举TransactionStatus
-	private String auditTime;		// auditTime
-	private String auditNote;		// auditNote
-	private String auditSystemUserID;		// auditSystemUserID
-	private String auditUserName;		// auditUserName
-	private String userID;		// 用户Id
-	private String formData;		// 支付回调返回数据
-	private String bankID;		// 银行Id
-	private String bankCode;		// bankCode
-	private String info;		// info
-	private String rePayFlag;		// 支付状态 1支付成功 
-	private String dealRePayFlag;		// dealRePayFlag
-	private String kuaiQianPayTypeID;		// kuaiQianPayTypeID
-	private String refundAmount;		// refundAmount
-	private String muiltFlag;		// 是否多个订单支付：1是，空或0否
-	private String relateIDs;		// 关联订单号（多个订单）
-	private String proberlem;		// proberlem
-	private String kuaiQianPayerID;		// kuaiQianPayerID
-	private String totalAmount;		// totalAmount
-	private String useBalanceAmount;		// useBalanceAmount
-	private String useBeanAmount;		// useBeanAmount
-	private String discountFee;		// discountFee
-	private String finalFee;		// 运费
-	private String paySource;		// paySource
-	
-	public Transaction() {
-		super();
-	}
-
-	public Transaction(String id){
-		super(id);
-	}
-
-	@Length(min=1, max=11, message="transactionID长度必须介于 1 和 11 之间")
-	public String getTransactionID() {
-		return transactionID;
-	}
-
-	public void setTransactionID(String transactionID) {
-		this.transactionID = transactionID;
-	}
-	
-	@Length(min=0, max=11, message="交易方式：见表c_transactionway长度必须介于 0 和 11 之间")
-	public String getTransactionWayID() {
-		return transactionWayID;
-	}
-
-	public void setTransactionWayID(String transactionWayID) {
-		this.transactionWayID = transactionWayID;
-	}
-	
-	@Length(min=0, max=11, message="交易类型：见表c_transactiontype长度必须介于 0 和 11 之间")
-	public String getTransactionTypeID() {
-		return transactionTypeID;
-	}
-
-	public void setTransactionTypeID(String transactionTypeID) {
-		this.transactionTypeID = transactionTypeID;
-	}
-	
-	@Length(min=0, max=11, message="支付方式长度必须介于 0 和 11 之间")
-	public String getPayTypeID() {
-		return payTypeID;
-	}
-
-	public void setPayTypeID(String payTypeID) {
-		this.payTypeID = payTypeID;
-	}
-	
-	@Length(min=0, max=50, message="描述长度必须介于 0 和 50 之间")
-	public String getTitle() {
-		return title;
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
-	
-	public String getAmount() {
-		return amount;
-	}
-
-	public void setAmount(String amount) {
-		this.amount = amount;
-	}
-	
-	public String getActualAmount() {
-		return actualAmount;
-	}
-
-	public void setActualAmount(String actualAmount) {
-		this.actualAmount = actualAmount;
-	}
-	
-	@Length(min=0, max=19, message="创建时间长度必须介于 0 和 19 之间")
-	public String getAddTime() {
-		return addTime;
-	}
-
-	public void setAddTime(String addTime) {
-		this.addTime = addTime;
-	}
-	
-	@Length(min=0, max=19, message="支付时间长度必须介于 0 和 19 之间")
-	public String getPayTime() {
-		return payTime;
-	}
-
-	public void setPayTime(String payTime) {
-		this.payTime = payTime;
-	}
-	
-	@Length(min=0, max=100, message="交易号长度必须介于 0 和 100 之间")
-	public String getTransactionNum() {
-		return transactionNum;
-	}
-
-	public void setTransactionNum(String transactionNum) {
-		this.transactionNum = transactionNum;
-	}
-	
-	@Length(min=0, max=11, message="关联订单号（单个订单）长度必须介于 0 和 11 之间")
-	public String getRelateID() {
-		return relateID;
-	}
-
-	public void setRelateID(String relateID) {
-		this.relateID = relateID;
-	}
-	
-	@Length(min=0, max=1, message="交易状态：见表c_transactionstatus或枚举TransactionStatus长度必须介于 0 和 1 之间")
-	public String getStatus() {
-		return status;
-	}
-
-	public void setStatus(String status) {
-		this.status = status;
-	}
-	
-	@Length(min=0, max=19, message="auditTime长度必须介于 0 和 19 之间")
-	public String getAuditTime() {
-		return auditTime;
-	}
-
-	public void setAuditTime(String auditTime) {
-		this.auditTime = auditTime;
-	}
-	
-	@Length(min=0, max=200, message="auditNote长度必须介于 0 和 200 之间")
-	public String getAuditNote() {
-		return auditNote;
-	}
-
-	public void setAuditNote(String auditNote) {
-		this.auditNote = auditNote;
-	}
-	
-	@Length(min=0, max=11, message="auditSystemUserID长度必须介于 0 和 11 之间")
-	public String getAuditSystemUserID() {
-		return auditSystemUserID;
-	}
-
-	public void setAuditSystemUserID(String auditSystemUserID) {
-		this.auditSystemUserID = auditSystemUserID;
-	}
-	
-	@Length(min=0, max=50, message="auditUserName长度必须介于 0 和 50 之间")
-	public String getAuditUserName() {
-		return auditUserName;
-	}
-
-	public void setAuditUserName(String auditUserName) {
-		this.auditUserName = auditUserName;
-	}
-	
-	@Length(min=0, max=11, message="用户Id长度必须介于 0 和 11 之间")
-	public String getUserID() {
-		return userID;
-	}
-
-	public void setUserID(String userID) {
-		this.userID = userID;
-	}
-	
-	public String getFormData() {
-		return formData;
-	}
-
-	public void setFormData(String formData) {
-		this.formData = formData;
-	}
-	
-	@Length(min=0, max=11, message="银行Id长度必须介于 0 和 11 之间")
-	public String getBankID() {
-		return bankID;
-	}
-
-	public void setBankID(String bankID) {
-		this.bankID = bankID;
-	}
-	
-	@Length(min=0, max=10, message="bankCode长度必须介于 0 和 10 之间")
-	public String getBankCode() {
-		return bankCode;
-	}
-
-	public void setBankCode(String bankCode) {
-		this.bankCode = bankCode;
-	}
-	
-	@Length(min=0, max=200, message="info长度必须介于 0 和 200 之间")
-	public String getInfo() {
-		return info;
-	}
-
-	public void setInfo(String info) {
-		this.info = info;
-	}
-	
-	@Length(min=0, max=1, message="支付状态 1支付成功 长度必须介于 0 和 1 之间")
-	public String getRePayFlag() {
-		return rePayFlag;
-	}
-
-	public void setRePayFlag(String rePayFlag) {
-		this.rePayFlag = rePayFlag;
-	}
-	
-	@Length(min=0, max=1, message="dealRePayFlag长度必须介于 0 和 1 之间")
-	public String getDealRePayFlag() {
-		return dealRePayFlag;
-	}
-
-	public void setDealRePayFlag(String dealRePayFlag) {
-		this.dealRePayFlag = dealRePayFlag;
-	}
-	
-	@Length(min=0, max=10, message="kuaiQianPayTypeID长度必须介于 0 和 10 之间")
-	public String getKuaiQianPayTypeID() {
-		return kuaiQianPayTypeID;
-	}
-
-	public void setKuaiQianPayTypeID(String kuaiQianPayTypeID) {
-		this.kuaiQianPayTypeID = kuaiQianPayTypeID;
-	}
-	
-	public String getRefundAmount() {
-		return refundAmount;
-	}
-
-	public void setRefundAmount(String refundAmount) {
-		this.refundAmount = refundAmount;
-	}
-	
-	@Length(min=0, max=1, message="是否多个订单支付：1是，空或0否长度必须介于 0 和 1 之间")
-	public String getMuiltFlag() {
-		return muiltFlag;
-	}
-
-	public void setMuiltFlag(String muiltFlag) {
-		this.muiltFlag = muiltFlag;
-	}
-	
-	@Length(min=0, max=500, message="关联订单号（多个订单）长度必须介于 0 和 500 之间")
-	public String getRelateIDs() {
-		return relateIDs;
-	}
-
-	public void setRelateIDs(String relateIDs) {
-		this.relateIDs = relateIDs;
-	}
-	
-	public String getProberlem() {
-		return proberlem;
-	}
-
-	public void setProberlem(String proberlem) {
-		this.proberlem = proberlem;
-	}
-	
-	@Length(min=0, max=50, message="kuaiQianPayerID长度必须介于 0 和 50 之间")
-	public String getKuaiQianPayerID() {
-		return kuaiQianPayerID;
-	}
-
-	public void setKuaiQianPayerID(String kuaiQianPayerID) {
-		this.kuaiQianPayerID = kuaiQianPayerID;
-	}
-	
-	public String getTotalAmount() {
-		return totalAmount;
-	}
-
-	public void setTotalAmount(String totalAmount) {
-		this.totalAmount = totalAmount;
-	}
-	
-	public String getUseBalanceAmount() {
-		return useBalanceAmount;
-	}
-
-	public void setUseBalanceAmount(String useBalanceAmount) {
-		this.useBalanceAmount = useBalanceAmount;
-	}
-	
-	@Length(min=0, max=11, message="useBeanAmount长度必须介于 0 和 11 之间")
-	public String getUseBeanAmount() {
-		return useBeanAmount;
-	}
-
-	public void setUseBeanAmount(String useBeanAmount) {
-		this.useBeanAmount = useBeanAmount;
-	}
-	
-	public String getDiscountFee() {
-		return discountFee;
-	}
-
-	public void setDiscountFee(String discountFee) {
-		this.discountFee = discountFee;
-	}
-	
-	public String getFinalFee() {
-		return finalFee;
-	}
-
-	public void setFinalFee(String finalFee) {
-		this.finalFee = finalFee;
-	}
-	
-	@Length(min=0, max=255, message="paySource长度必须介于 0 和 255 之间")
-	public String getPaySource() {
-		return paySource;
-	}
-
-	public void setPaySource(String paySource) {
-		this.paySource = paySource;
-	}
-	
-}

src/main/java/com/caimei/modules/bulkpurchase/service/BpOrderCirculationService.java

@@ -1,58 +0,0 @@
-package com.caimei.modules.bulkpurchase.service;
-
-import com.caimei.modules.bulkpurchase.dao.BpOrderCirculationDao;
-import com.caimei.modules.bulkpurchase.entity.BpOrderCirculation;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.thinkgem.jeesite.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-/**
- * .订单传阅
- *
- * @author ZCP
- * @version 2017-08-03
- **/
-@Service
-@Transactional(readOnly = true)
-public class BpOrderCirculationService extends CrudService<BpOrderCirculationDao,BpOrderCirculation> {
-
-    @Autowired
-    BpOrderCirculationDao bpOrderCirculationDao;
-
-    /**
-     * 查询所有
-     * @return
-     * @param bpOrderCirculation
-     */
-    public List<BpOrderCirculation> findAllList(BpOrderCirculation bpOrderCirculation) {
-        return bpOrderCirculationDao.findAllList(bpOrderCirculation);
-    }
-
-    /**
-     * 删除
-     * @return
-     */
-    @Transactional(readOnly = false)
-    public void delete(Long userId) {
-        bpOrderCirculationDao.delete(userId);
-    }
-
-    /**
-     * 增加一条数据
-     * @return
-     */
-    @Transactional(readOnly = false)
-    public void insert(BpOrderCirculation bpOrderCirculation) {
-        bpOrderCirculationDao.insert(bpOrderCirculation);
-    }
-
-
-    @Transactional(readOnly = false)
-    public void update(String userId, String buyerRole, String shopRole) {
-        bpOrderCirculationDao.update(userId, buyerRole, shopRole, DateUtils.getDateTime());
-    }
-}

src/main/java/com/caimei/modules/bulkpurchase/service/BpOrderProductRemarkService.java

@@ -1,44 +0,0 @@
-package com.caimei.modules.bulkpurchase.service;
-
-import java.util.List;
-
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.caimei.modules.bulkpurchase.entity.BpOrderProductRemark;
-import com.caimei.modules.bulkpurchase.dao.BpOrderProductRemarkDao;
-
-/**
- * 大宗采购订单商品备注Service
- * @author LiJun
- * @version 2018-04-03
- */
-@Service
-@Transactional(readOnly = true)
-public class BpOrderProductRemarkService extends CrudService<BpOrderProductRemarkDao, BpOrderProductRemark> {
-
-	public BpOrderProductRemark get(String id) {
-		return super.get(id);
-	}
-	
-	public List<BpOrderProductRemark> findList(BpOrderProductRemark bpOrderProductRemark) {
-		return super.findList(bpOrderProductRemark);
-	}
-	
-	public Page<BpOrderProductRemark> findPage(Page<BpOrderProductRemark> page, BpOrderProductRemark bpOrderProductRemark) {
-		return super.findPage(page, bpOrderProductRemark);
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(BpOrderProductRemark bpOrderProductRemark) {
-		super.save(bpOrderProductRemark);
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(BpOrderProductRemark bpOrderProductRemark) {
-		super.delete(bpOrderProductRemark);
-	}
-	
-}

src/main/java/com/caimei/modules/bulkpurchase/service/BpOrderStagesShopService.java

@@ -1,44 +0,0 @@
-package com.caimei.modules.bulkpurchase.service;
-
-import java.util.List;
-
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.caimei.modules.bulkpurchase.entity.BpOrderStagesShop;
-import com.caimei.modules.bulkpurchase.dao.BpOrderStagesShopDao;
-
-/**
- * 分期订单-应付供应商Service
- * @author zcp
- * @version 2018-04-09
- */
-@Service
-@Transactional(readOnly = true)
-public class BpOrderStagesShopService extends CrudService<BpOrderStagesShopDao, BpOrderStagesShop> {
-
-	public BpOrderStagesShop get(String id) {
-		return super.get(id);
-	}
-	
-	public List<BpOrderStagesShop> findList(BpOrderStagesShop bpOrderStagesShop) {
-		return super.findList(bpOrderStagesShop);
-	}
-	
-	public Page<BpOrderStagesShop> findPage(Page<BpOrderStagesShop> page, BpOrderStagesShop bpOrderStagesShop) {
-		return super.findPage(page, bpOrderStagesShop);
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(BpOrderStagesShop bpOrderStagesShop) {
-		super.save(bpOrderStagesShop);
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(BpOrderStagesShop bpOrderStagesShop) {
-		super.delete(bpOrderStagesShop);
-	}
-	
-}

src/main/java/com/caimei/modules/bulkpurchase/service/BpOrderUserinfoService.java

@@ -1,75 +0,0 @@
-package com.caimei.modules.bulkpurchase.service;
-
-import java.util.List;
-import java.util.Map;
-
-import com.thinkgem.jeesite.common.utils.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.caimei.modules.bulkpurchase.entity.BpOrderUserinfo;
-import com.caimei.modules.bulkpurchase.dao.BpOrderUserinfoDao;
-
-/**
- * 订单客户详情Service
- * @author jiangjunwen
- * @version 2017-04-07
- */
-@Service
-@Transactional(readOnly = true)
-public class BpOrderUserinfoService extends CrudService<BpOrderUserinfoDao, BpOrderUserinfo> {
-	@Autowired
-	private BpOrderUserinfoDao bpOrderUserinfoDao;
-	public BpOrderUserinfo get(String id) {
-		return super.get(id);
-	}
-	
-	public List<BpOrderUserinfo> findList(BpOrderUserinfo bpOrderUserinfo) {
-		return super.findList(bpOrderUserinfo);
-	}
-	
-	public Page<BpOrderUserinfo> findPage(Page<BpOrderUserinfo> page, BpOrderUserinfo bpOrderUserinfo) {
-		return super.findPage(page, bpOrderUserinfo);
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(BpOrderUserinfo bpOrderUserinfo) {
-		super.save(bpOrderUserinfo);
-	}
-
-	@Transactional(readOnly = false)
-	public void saveWithcity(BpOrderUserinfo bpOrderUserinfo) {
-		if(StringUtils.isEmpty(bpOrderUserinfo.getCity())){
-		List<Map<String,String>>list=	bpOrderUserinfoDao.findCityByUserId(bpOrderUserinfo.getUserId());
-		if (null!=list && list.size()>0 ){
-            Map<String, String> map = list.get(0);
-            if (StringUtils.isEmpty(map.get("provinceName"))){
-                bpOrderUserinfo.setProvince(map.get("provinceName"));
-            }
-            if (StringUtils.isEmpty(map.get("cityName"))){
-                bpOrderUserinfo.setCity(map.get("cityName"));
-            }
-            if (StringUtils.isEmpty(map.get("townName"))){
-                bpOrderUserinfo.setTown(map.get("townName"));
-            }
-        }
-		}
-		save(bpOrderUserinfo);
-	}
-
-	@Transactional(readOnly = false)
-	public void delete(BpOrderUserinfo bpOrderUserinfo) {
-		super.delete(bpOrderUserinfo);
-	}
-
-	public BpOrderUserinfo selectUserInfoById(String id){
-		return bpOrderUserinfoDao.selectUserInfoById(id).get(0);
-	}
-
-	public  BpOrderUserinfo getWithorderId(String orderId){
-	    return bpOrderUserinfoDao.getWithorderId(orderId);
-    }
-}

src/main/java/com/caimei/modules/bulkpurchase/service/CmFinanceChargeService.java

@@ -1,72 +0,0 @@
-package com.caimei.modules.bulkpurchase.service;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.caimei.modules.bulkpurchase.entity.CmFinanceCharge;
-import com.caimei.modules.bulkpurchase.dao.CmFinanceChargeDao;
-
-/**
- * 出账信息Service
- * @author LiJun
- * @version 2017-06-04
- */
-@Service
-@Transactional(readOnly = true)
-public class CmFinanceChargeService extends CrudService<CmFinanceChargeDao, CmFinanceCharge> {
-
-	@Autowired
-	private  CmFinanceChargeDao cmFinanceChargeDao;
-
-	public Long getMaxPrimaryKey(){
-		Long maxId = cmFinanceChargeDao.getMaxPrimaryKey();
-		return maxId;
-	}
-
-	public CmFinanceCharge get(String id) {
-		return super.get(id);
-	}
-
-	public List<CmFinanceCharge> findList(CmFinanceCharge cmFinanceCharge) {
-		return super.findList(cmFinanceCharge);
-	}
-
-	public List<CmFinanceCharge> findListByProductId(String productId) {
-		return cmFinanceChargeDao.findListByProductId(productId);
-	}
-	//分期
-	public List<CmFinanceCharge> findListByStagesId(String stagesId) {
-		return cmFinanceChargeDao.findListByStagesId(stagesId);
-	}
-
-	public List<CmFinanceCharge> findListGroupByproductIds(String productId) {
-		return cmFinanceChargeDao.findListGroupByproductIds(productId);
-	}
-
-	public Double findShopPayByProductId(String productId) {
-		return cmFinanceChargeDao.findShopPayByProductId(productId);
-	}
-
-	public Double findOtherPayByProductId(String productId) {
-		return cmFinanceChargeDao.findOtherPayByProductId(productId);
-	}
-	public Page<CmFinanceCharge> findPage(Page<CmFinanceCharge> page, CmFinanceCharge cmFinanceCharge) {
-		return super.findPage(page, cmFinanceCharge);
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(CmFinanceCharge cmFinanceCharge) {
-		super.save(cmFinanceCharge);
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(CmFinanceCharge cmFinanceCharge) {
-		super.delete(cmFinanceCharge);
-	}
-	
-}

src/main/java/com/caimei/modules/bulkpurchase/service/CmFinanceChargeStagesService.java

@@ -1,56 +0,0 @@
-package com.caimei.modules.bulkpurchase.service;
-
-import com.caimei.modules.bulkpurchase.dao.CmFinanceChargeStagesDao;
-import com.caimei.modules.bulkpurchase.entity.CmFinanceChargeStages;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-/**
- * 分期已付供应商列表Service
- *
- * @author zcp
- * @version 2018-04-11
- */
-@Service
-@Transactional(readOnly = true)
-public class CmFinanceChargeStagesService extends CrudService<CmFinanceChargeStagesDao, CmFinanceChargeStages> {
-
-    @Autowired
-    private CmFinanceChargeStagesDao cmFinanceChargeStagesDao;
-
-    public CmFinanceChargeStages get(String id) {
-        return super.get(id);
-    }
-
-    public List<CmFinanceChargeStages> findList(CmFinanceChargeStages cmFinanceChargeStages) {
-        return super.findList(cmFinanceChargeStages);
-    }
-
-    public Page<CmFinanceChargeStages> findPage(Page<CmFinanceChargeStages> page, CmFinanceChargeStages cmFinanceChargeStages) {
-        return super.findPage(page, cmFinanceChargeStages);
-    }
-
-    @Transactional(readOnly = false)
-    public void save(CmFinanceChargeStages cmFinanceChargeStages) {
-        super.save(cmFinanceChargeStages);
-    }
-
-    @Transactional(readOnly = false)
-    public void delete(CmFinanceChargeStages cmFinanceChargeStages) {
-        super.delete(cmFinanceChargeStages);
-    }
-
-    public Double getSumByStagesId(Integer stagesId, Integer shopId,String status) {
-        return cmFinanceChargeStagesDao.getSumByStagesId(stagesId, shopId,status);
-    }
-
-    public CmFinanceChargeStages getByChargeAndShop(Integer chargeId , Integer shopId){
-        return cmFinanceChargeStagesDao.getByChargeAndShop(chargeId,shopId);
-    }
-
-}

src/main/java/com/caimei/modules/bulkpurchase/service/CmFinanceReceiptsService.java

@@ -1,113 +0,0 @@
-package com.caimei.modules.bulkpurchase.service;
-
-import java.util.List;
-
-import com.caimei.modules.bulkpurchase.dao.ContractOrderDao;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.caimei.modules.bulkpurchase.entity.CmFinanceReceipts;
-import com.caimei.modules.bulkpurchase.dao.CmFinanceReceiptsDao;
-import java.util.Date;
-/**
- * 进账信息Service
- * @author 李俊
- * @version 2017-06-04
- */
-@Service
-@Transactional(readOnly = true)
-public class CmFinanceReceiptsService extends CrudService<CmFinanceReceiptsDao, CmFinanceReceipts> {
-	@Autowired
-	private CmFinanceReceiptsDao cmFinanceReceiptsDao;
-
-	public CmFinanceReceipts get(String id) {
-		return super.get(id);
-	}
-	
-	public List<CmFinanceReceipts> findList(CmFinanceReceipts cmFinanceReceipts) {
-		return super.findList(cmFinanceReceipts);
-	}
-	
-	public Page<CmFinanceReceipts> findPage(Page<CmFinanceReceipts> page, CmFinanceReceipts cmFinanceReceipts) {
-		return super.findPage(page, cmFinanceReceipts);
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(CmFinanceReceipts cmFinanceReceipts) {
-		super.save(cmFinanceReceipts);
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(CmFinanceReceipts cmFinanceReceipts) {
-		super.delete(cmFinanceReceipts);
-	}
-
-	@Transactional(readOnly = false)
-	public List<CmFinanceReceipts> findAllList() {
-		return cmFinanceReceiptsDao.findAllList();
-	}
-
-	@Transactional(readOnly = false)
-	public void updateReviewStatusPass(String orderProductId, String orderId,String reStatus,Date reviewDate) {
-		cmFinanceReceiptsDao.updateReviewStatusPass(orderProductId,orderId,reStatus,reviewDate);
-	}
-
-	@Transactional(readOnly = false)
-	public void updateReviewStatusPassById(String receiptsId,String reStatus,Date reviewDate) {
-		cmFinanceReceiptsDao.updateReviewStatusPassById(receiptsId,reStatus,reviewDate);
-	}
-
-	@Transactional(readOnly = false)
-	public void updateReviewStatusFail(String orderProductId, String orderId,String reStatus) {
-		cmFinanceReceiptsDao.updateReviewStatusFail(orderProductId,orderId,reStatus);
-	}
-
-	@Transactional(readOnly = false)
-	public void updateReviewStatusFailById(String receiptsId,String reStatus) {
-		cmFinanceReceiptsDao.updateReviewStatusFailById(receiptsId,reStatus);
-	}
-
-
-	@Transactional(readOnly = false)
-	public void deleteFinanceReceipts(String orderProductId, String orderId) {
-		cmFinanceReceiptsDao.deleteFinanceReceipts(orderProductId,orderId);
-	}
-
-	@Transactional(readOnly = false)
-	public void deleteFinanceReceiptsById(String receiptsId) {
-		cmFinanceReceiptsDao.deleteFinanceReceiptsById(receiptsId);
-	}
-
-	@Transactional(readOnly = false)
-	public List<CmFinanceReceipts>  findListByProductIds(String productIds,String orderId,String status) {
-		return cmFinanceReceiptsDao.findListByProductIds(productIds,orderId,status);
-	}
-
-	public List<CmFinanceReceipts>  findListByStagesId(String stagesId,String orderId,String status) {
-		return cmFinanceReceiptsDao.findListByStagesId(stagesId,orderId,status);
-	}
-
-	@Transactional(readOnly = false)
-	public int  updateRecord(CmFinanceReceipts cmFinanceReceipts) {
-		return cmFinanceReceiptsDao.updateRecord(cmFinanceReceipts);
-	}
-
-	@Transactional(readOnly = false)
-	public int  updateStatus(CmFinanceReceipts cmFinanceReceipts) {
-		return cmFinanceReceiptsDao.updateStatus(cmFinanceReceipts);
-	}
-
-	@Transactional(readOnly = false)
-	public void updateDeleteFlag(CmFinanceReceipts cmFinanceReceipts) {
-		cmFinanceReceiptsDao.updateDeleteFlag(cmFinanceReceipts);
-	}
-
-	@Transactional(readOnly = false)
-	public  List<CmFinanceReceipts> getFinanceReceiptsByOrderNo(@Param("orderNo") String orderNo){
-		return cmFinanceReceiptsDao.getFinanceReceiptsByOrderNo(orderNo);
-	}
-}

src/main/java/com/caimei/modules/bulkpurchase/service/CmRefundsRecordService.java

@@ -1,44 +0,0 @@
-package com.caimei.modules.bulkpurchase.service;
-
-import java.util.List;
-
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.caimei.modules.bulkpurchase.entity.CmRefundsRecord;
-import com.caimei.modules.bulkpurchase.dao.CmRefundsRecordDao;
-
-/**
- * 协商记录列表Service
- * @author sunqi
- * @version 2017-11-24
- */
-@Service
-@Transactional(readOnly = true)
-public class CmRefundsRecordService extends CrudService<CmRefundsRecordDao, CmRefundsRecord> {
-
-	public CmRefundsRecord get(String id) {
-		return super.get(id);
-	}
-	
-	public List<CmRefundsRecord> findList(CmRefundsRecord cmRefundsRecord) {
-		return super.findList(cmRefundsRecord);
-	}
-	
-	public Page<CmRefundsRecord> findPage(Page<CmRefundsRecord> page, CmRefundsRecord cmRefundsRecord) {
-		return super.findPage(page, cmRefundsRecord);
-	}
-	
-	@Transactional(readOnly = false)
-	public void save(CmRefundsRecord cmRefundsRecord) {
-		super.save(cmRefundsRecord);
-	}
-	
-	@Transactional(readOnly = false)
-	public void delete(CmRefundsRecord cmRefundsRecord) {
-		super.delete(cmRefundsRecord);
-	}
-	
-}

src/main/java/com/caimei/modules/bulkpurchase/service/CommissionsService.java

@@ -1,37 +0,0 @@
-package com.caimei.modules.bulkpurchase.service;
-
-import com.caimei.modules.bulkpurchase.dao.CommissionsDao;
-import com.caimei.modules.bulkpurchase.entity.Commissions;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.thinkgem.jeesite.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-/**
- * Description
- *
- * @author : Charles
- * @date : 2022/3/25
- */
-@Service
-@Transactional(readOnly = true)
-public class CommissionsService extends CrudService<CommissionsDao,Commissions> {
-
-    @Autowired
-    CommissionsDao commissionsDao;
-
-
-   public List<Commissions> findList(Commissions commissions){
-
-        return commissionsDao.findList(commissions);
-    }
-
-    @Transactional(readOnly = false)
-    public int insert(Commissions commissions){
-       return commissionsDao.insert(commissions);
-    }
-
-}

src/main/java/com/caimei/modules/bulkpurchase/service/ContractOrderService.java

@@ -1,324 +0,0 @@
-package com.caimei.modules.bulkpurchase.service;
-
-import com.caimei.modules.bulkpurchase.dao.*;
-import com.caimei.modules.bulkpurchase.entity.*;
-import com.caimei.utils.MathUtil;
-import com.google.common.collect.Lists;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.thinkgem.jeesite.common.utils.DateUtils;
-import com.thinkgem.jeesite.common.utils.StringUtils;
-import com.thinkgem.jeesite.modules.sys.utils.UserUtils;
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 采购订单Service
- *
- * @author jiangjunwen
- * @version 2017-04-07
- */
-@Service
-@Transactional(readOnly = true)
-public class ContractOrderService extends CrudService<ContractOrderDao, ContractOrder> {
-    @Autowired
-    private ContractOrderDao contractOrderDao;
-    @Autowired
-    private BpOrderUserinfoService bpOrderUserinfoService;
-    @Autowired
-    private OrderInvoiceService orderInvoiceService;
-    @Autowired
-    private OrderProductDao orderProductDao;
-    @Autowired
-    private ContractDao contractDao;
-    @Autowired
-    private OrderStagesDao orderStagesDao;
-    @Autowired
-    private OrderStagesProductDao orderStagesProductDao;
-    @Autowired
-    private BpOrderStagesShopDao orderStagesShopDao;
-    @Autowired
-    private BpClauseService bpClauseService;
-
-    public ContractOrder get(String id) {
-        ContractOrder contractOrder = super.get(id);
-        if(null !=contractOrder){
-            //获取订单客户
-            BpOrderUserinfo bpOrderUserinfo = bpOrderUserinfoService.getWithorderId(contractOrder.getId());
-            if (null != bpOrderUserinfo) {
-                contractOrder.setBpOrderUserinfo(bpOrderUserinfo);
-            }
-            //获取订单商品
-            List<OrderProduct> list = orderProductDao.getWithorderId(contractOrder.getId());
-            if (CollectionUtils.isNotEmpty(list)) {
-                contractOrder.setOrderProduct(list);
-            }
-            //获取订单发票
-            OrderInvoice orderInvoice = orderInvoiceService.getWithorderId(contractOrder.getId());
-            if (null != orderInvoice) {
-                contractOrder.setOrderInvoice(orderInvoice);
-            }
-            String contractId = contractOrder.getContractId();
-            if(StringUtils.isNotEmpty(contractId)){
-                //获取采购基本信息(针对V1.2.0之前版本存在合同订单)
-                Contract contract = contractDao.get(contractId);
-                contractOrder.setContract(contract);
-            }
-            if(StringUtils.equals(contractOrder.getStagesFlag(),"1")){
-                OrderStages orderStages=new OrderStages();
-                orderStages.setOrderId(Long.parseLong(contractOrder.getId()));
-                List<OrderStages> orderStagesList = orderStagesDao.findList(orderStages);
-                if(CollectionUtils.isNotEmpty(orderStagesList)){
-                    for (OrderStages o:orderStagesList) {
-                        List<OrderStagesProduct> stagesProductBuyStagesId = orderStagesProductDao.findStagesProductBuyStagesId(o.getId());
-                        o.setOrderStagesProductList(stagesProductBuyStagesId);
-                        //获取分期订单-应付供应商列表
-                        BpOrderStagesShop orderStagesShop = new BpOrderStagesShop();
-                        orderStagesShop.setStagesId(Integer.parseInt(o.getId()));
-                        List<BpOrderStagesShop> orderStagesShops = Lists.newArrayList();
-                        orderStagesShops = orderStagesShopDao.findList(orderStagesShop);
-                        if (CollectionUtils.isEmpty(orderStagesShops)){
-                            //如果是之前的订单 通过订单商品获取应付供应商列表
-                            List<OrderProduct> productList = orderProductDao.getWithorderIdGroupByShopId(contractOrder.getId());
-                            if (CollectionUtils.isNotEmpty(productList)){
-                                BpOrderStagesShop orderStagesShop1 = new BpOrderStagesShop();
-                                for (OrderProduct orderProduct : productList){
-                                    orderStagesShop1.setShopId(orderProduct.getShopId().intValue());
-                                    orderStagesShop1.setShopFee(new BigDecimal(0.00));
-                                    orderStagesShop1.setShopName(orderProduct.getShopName());
-                                    orderStagesShops.add(orderStagesShop1);
-                                }
-                            }
-                        }
-                        o.setOrderStagesShopList(orderStagesShops);
-                    }
-                    contractOrder.setOrderStages(orderStagesList);
-                }
-            }
-        }
-        return contractOrder;
-    }
-
-    public List<ContractOrder> findList(ContractOrder contractOrder) {
-        return super.findList(contractOrder);
-    }
-
-    public Page<ContractOrder> findPage(Page<ContractOrder> page, ContractOrder contractOrder) {
-        return super.findPage(page, contractOrder);
-    }
-
-    @Transactional(readOnly = false)
-    public void save(ContractOrder contractOrder) {
-        boolean flag=false;//是否新增标志
-        if(StringUtils.isEmpty(contractOrder.getId())){
-            flag=true;
-        }
-
-        //增加快照条款内容
-        Long clauseId = contractOrder.getClauseId();
-        String clauseContent = contractOrder.getClauseContent();
-        BpClause bpClause = bpClauseService.get(String.valueOf(clauseId));
-        if(StringUtils.isEmpty(clauseContent) && null != bpClause){//第一次保存数据则按照条款表设置，后面再保存可能存在修改过快照，此时存在条款内容不允许修改
-            contractOrder.setClauseName(bpClause.getName());
-            contractOrder.setClauseContent(bpClause.getContent());
-        }
-
-        if(StringUtils.isEmpty(contractOrder.getPayWay()))contractOrder.setPayWay("0");
-        contractOrder.setClubId(contractOrder.getBpOrderUserinfo().getClubId());
-        if(StringUtils.isEmpty(contractOrder.getDiscount())){//设置折扣
-            contractOrder.setDiscount("0");
-        }
-        if(StringUtils.isEmpty(contractOrder.getBalancePayFee())){//设置余额
-            contractOrder.setBalancePayFee(0+"");
-        }
-        if("".equals(contractOrder.getContractId()))contractOrder.setContractId(null);
-        if(!StringUtils.equals("1",contractOrder.getConfirmFlag())){
-            contractOrder.setConfirmFlag("0");
-        }
-//        super.save(contractOrder);
-        if (contractOrder.getIsNewRecord()){
-            contractOrderDao.insert(contractOrder);
-        }else{
-            contractOrderDao.update(contractOrder);
-        }
-
-        //订单客户
-        BpOrderUserinfo bpOrderUserinfo = contractOrder.getBpOrderUserinfo();
-
-        //发票信息
-        OrderInvoice orderInvoice = contractOrder.getOrderInvoice();
-        if(flag){//新增
-            bpOrderUserinfo.setOrderId(Long.parseLong(contractOrder.getId()));
-        }
-
-        if(null != orderInvoice){
-            orderInvoice.setOrderId(Long.parseLong(contractOrder.getId()));
-            orderInvoice.setInvoiceType("普通发票");
-            orderInvoice.setInvoiceContent("明细");
-            orderInvoiceService.save(orderInvoice);
-        }
-        bpOrderUserinfoService.saveWithcity(bpOrderUserinfo);
-
-        //采购中选中保存的订单商品
-        List<OrderProduct> orderProducts = contractOrder.getOrderProduct();
-        //数据库中的订单商品
-        OrderProduct orderProduct=new OrderProduct();
-        orderProduct.setOrderId(Long.parseLong(contractOrder.getId()));
-        List<OrderProduct> dbOrderProducts= orderProductDao.findAllList(orderProduct);
-
-        if(!flag && null==contractOrder.getContractId()){//直接添加订单，修改订单的时候
-            orderProductDao.deleteByOrderId(contractOrder.getId());
-            for (OrderProduct product : orderProducts) {
-                product.setOrderId(Long.parseLong(contractOrder.getId()));
-                orderProductDao.insert(product);
-            }
-        }else {
-            // 重新保存逻辑
-            if (CollectionUtils.isNotEmpty(orderProducts)) {
-                for (OrderProduct product : orderProducts) {
-                    if (StringUtils.isEmpty(product.getId())) {//新增：表单订单商品ID为空
-                        product.setOrderId(Long.parseLong(contractOrder.getId()));
-                        orderProductDao.insert(product);
-                    } else {//修改：表单所有ID不为空的修改
-                        if (CollectionUtils.isNotEmpty(dbOrderProducts)) {
-                            for (OrderProduct dbProduct : dbOrderProducts) {
-                                if (StringUtils.equals(dbProduct.getId(), product.getId())) {
-                                    product.setOrderId(Long.parseLong(contractOrder.getId()));
-                                    orderProductDao.update(product);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            //删除
-            if (CollectionUtils.isNotEmpty(orderProducts)) {
-                for (OrderProduct dbProduct : dbOrderProducts) {
-                    boolean b = true;//删除
-                    for (OrderProduct product : orderProducts) {
-                        if (StringUtils.equals(dbProduct.getId(), product.getId())) {
-                            b = false;//不删除
-                        }
-                    }
-                    //删除：数据库有，表单没有的
-                    if (b) {
-                        dbProduct.setDelFlag(DateUtils.formatDate(new Date(), "yyyyMMddHHmmssSSSS"));
-                        orderProductDao.delete(dbProduct);
-                    }
-                }
-            }
-        }
-
-
-        //分期信息处理
-        //先删除分期相关信息
-        orderStagesDao.deleteByOrderId(contractOrder.getId());
-        orderStagesProductDao.deleteByOrderId(contractOrder.getId());
-        orderStagesShopDao.deleteByOrderId(contractOrder.getId());
-        if(StringUtils.equals("1",contractOrder.getStagesFlag())){//新增分期信息
-            List<OrderStages> orderStages=contractOrder.getOrderStages();
-            int index=1;
-            for (OrderStages orderStage:orderStages) {
-                orderStage.setOrderId(Long.parseLong(contractOrder.getId()));
-                orderStage.setNum(index);
-                orderStage.setUpdateDate(new Date());
-                orderStage.setServiceProviderId(contractOrder.getSpId());
-                orderStage.setClubId(contractOrder.getClubId());
-                orderStage.setClauseId(contractOrder.getClauseId());
-                logger.info("应付采美："+orderStage.getCmFee());
-                logger.info("应付三方："+orderStage.getOtherFee());
-                BigDecimal shopFee = new BigDecimal(0);//该期总应付供应商
-                if(CollectionUtils.isNotEmpty(orderStage.getOrderStagesShopList())){
-                    for (BpOrderStagesShop orderStagesShop:orderStage.getOrderStagesShopList()) {
-                        shopFee = MathUtil.add(shopFee,orderStagesShop.getShopFee());
-                    }
-                }
-                orderStage.setShopFee(shopFee);
-                orderStagesDao.insert(orderStage);
-
-                if(CollectionUtils.isNotEmpty(orderStage.getOrderStagesProductList())){
-                    for (OrderStagesProduct orderStagesProduct:orderStage.getOrderStagesProductList()) {
-                        orderStagesProduct.setOrderId(Long.parseLong(contractOrder.getId()));
-                        orderStagesProduct.setStagesId(Long.parseLong(orderStage.getId()));
-                        orderStagesProduct.setStagesNum(index);
-                        orderStagesProductDao.insert(orderStagesProduct);
-                    }
-                }
-                //添加应付供应商信息
-                if(CollectionUtils.isNotEmpty(orderStage.getOrderStagesShopList())){
-                    for (BpOrderStagesShop orderStagesShop:orderStage.getOrderStagesShopList()) {
-                        orderStagesShop.setOrderId(Integer.parseInt(contractOrder.getId()));
-                        orderStagesShop.setStagesId(Integer.parseInt(orderStage.getId()));
-                        orderStagesShop.setStagesNum(index);
-                        orderStagesShop.setAddTime(new Date());
-                        orderStagesShop.setUpdateBy(UserUtils.getUser());
-                        orderStagesShop.setUpdateDate(new Date());
-                        orderStagesShop.setCreateBy(UserUtils.getUser());
-                        orderStagesShop.setCreateDate(new Date());
-                        logger.info("应付供应商："+orderStagesShop.getShopFee());
-                        orderStagesShopDao.insert(orderStagesShop);
-                    }
-                }
-                index++;
-            }
-        }
-
-    }
-
-    @Transactional(readOnly = false)
-    public void saveConfirmFlag(ContractOrder contractOrder) {
-        contractOrderDao.saveConfirmFlag(contractOrder);
-    }
-
-    @Transactional(readOnly = false)
-    public void updateOrderStatus(String  orderId,String orderStatus) {
-        contractOrderDao.updateOrderStatus(orderId,orderStatus);
-    }
-
-    @Transactional(readOnly = false)
-    public void updateOrderStatusInfo(ContractOrder contractOrder) {
-        contractOrderDao.updateOrderStatusInfo(contractOrder);
-    }
-
-    @Transactional(readOnly = false)
-    public void saveOrderStatusFlag(ContractOrder contractOrder) {
-        contractOrderDao.saveOrderStatusFlag(contractOrder);
-    }
-    @Transactional(readOnly = false)
-    public void updateClauseContent(ContractOrder contractOrder) {
-        contractOrderDao.updateClauseContent(contractOrder);
-    }
-
-    @Transactional(readOnly = false)
-    public void delete(ContractOrder contractOrder) {
-        super.delete(contractOrder);
-    }
-    public  List<ContractOrder> findAllList( ContractOrder contractOrder) {
-        List<ContractOrder> list= contractOrderDao.findAllPage(contractOrder);
-       return list;
-    }
-
-    public Integer findCountList(String contractId) {
-        return contractOrderDao.findCountList(contractId);
-    }
-
-    public Integer findCompleteList(String contractId) {
-        return contractOrderDao.findCompleteList(contractId);
-    }
-
-    @Transactional(readOnly = false)
-    public void saveOrderStopInfo(ContractOrder contractOrder) {
-        contractOrderDao.saveOrderStopInfo(contractOrder);
-    }
-
-    public Integer getInfo(String qitaId) {
-        return contractOrderDao.findCountList(qitaId);
-    }
-
-}

src/main/java/com/caimei/modules/bulkpurchase/service/ContractService.java

@@ -1,171 +0,0 @@
-package com.caimei.modules.bulkpurchase.service;
-
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-import com.caimei.modules.bulkpurchase.entity.PurchaseProduct;
-import com.caimei.modules.bulkpurchase.entity.ProductPrivilege;
-import com.thinkgem.jeesite.common.utils.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.caimei.modules.bulkpurchase.entity.Contract;
-import com.caimei.modules.bulkpurchase.dao.ContractDao;
-
-/**
- * 采购信息Service
- *
- * @author jiangjunwen
- * @version 2017-03-27
- */
-@Service
-@Transactional(readOnly = true)
-public class ContractService extends CrudService<ContractDao, Contract> {
-    @Autowired
-    private ContractDao contractDao;
-    @Autowired
-    private PurchaseProductService purchaseProductService;
-    @Autowired
-    private ProductPrivilegeService productPrivilegeService;
-    @Autowired
-    private ContractOrderService contractOrderService;
-
-    public Contract get(String id) {
-        return super.get(id);
-    }
-
-    public List<Contract> findList(Contract contract) {
-        return super.findList(contract);
-    }
-
-    public Page<Contract> findPage(Page<Contract> page, Contract contract) {
-        return super.findPage(page, contract);
-    }
-
-    @Transactional(readOnly = false)
-    public void save(Contract contract) {
-
-        if (contract.getIsNewRecord()) {
-            contract.preInsert();
-            String id1 = contract.getCmClub().getId();
-            Date currentTime = new Date();
-            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
-            Date date = new Date();
-            contract.setCreateDate(date);
-            contract.setClubId(Long.parseLong(id1));
-            contract.setDelFlag(0 + "");
-            contractDao.insert(contract);
-            Long id = Long.parseLong(contract.getId());
-            List<PurchaseProduct> purchaseProduct = contract.getPurchaseProduct();
-
-            for (PurchaseProduct product : purchaseProduct) {
-                product.setContractId(id);
-                if (StringUtils.isEmpty(product.getStipulateFlag())) {
-                    product.setStipulateFlag("0");
-                }
-                purchaseProductService.save(product);
-                Long productId = Long.parseLong(product.getId());
-                List<ProductPrivilege> productPrivilege = product.getProductPrivilege();
-
-                if (productPrivilege != null && productPrivilege.size() > 0) {
-                    Collections.sort(productPrivilege);
-                    for (ProductPrivilege privilege : productPrivilege) {
-                        privilege.setContractProductId(productId);
-                        productPrivilegeService.save(privilege);
-                    }
-                }
-            }
-        } else {//更新记录
-            String clubId = contract.getCmClub().getId();
-            contract.setClubId(Long.parseLong(clubId));
-            contract.preUpdate();
-
-            //采购规定每次修改采购的校验------start
-            List<PurchaseProduct> purchaseProduct = contract.getPurchaseProduct();
-            int existFlag=1;//存在标识
-            int notExistFlag=1;//不存在标识
-            for (PurchaseProduct product : purchaseProduct) {
-                String stipulateFlag = product.getStipulateFlag();
-                if(StringUtils.isEmpty(stipulateFlag)) {
-                    stipulateFlag = "0";
-                }
-                long flag = Long.parseLong(stipulateFlag);
-                if (flag == 0) {//存在没规定必选商品
-                    notExistFlag = 2;
-                }
-                else{
-                    existFlag = 2;//存在规定必选商品
-                }
-            }
-            Long stipulateFee = contract.getStipulateFee();
-            if(null == stipulateFee && existFlag == 2){//存在必选商品且规定金额为空
-                Long longFlag = new Long(0);
-                contract.setStipulateFee(longFlag);
-            }
-            if( notExistFlag ==2 && existFlag ==1 && stipulateFee != null){//没有必选商品且规定金额不为null
-                Long longFlag = null;
-                contract.setStipulateFee(longFlag);
-            }
-            //采购规定每次修改采购的校验------end
-
-            //更新采购信息
-            dao.update(contract);
-            Long contractId = Long.parseLong(contract.getId());
-            //更新采购商品信息
-//            List<PurchaseProduct> purchaseProduct = contract.getPurchaseProduct();
-
-            for (PurchaseProduct product : purchaseProduct) {
-                product.setContractId(contractId);
-                if (StringUtils.isEmpty(product.getStipulateFlag())) {
-                    product.setStipulateFlag("0");
-                }
-                if(StringUtils.equals("",product.getId())){
-                    product.setId(null);
-                }
-                purchaseProductService.save(product);
-                Long productId = Long.parseLong(product.getId());
-                List<ProductPrivilege> productPrivilege = product.getProductPrivilege();
-
-                if (productPrivilege != null && productPrivilege.size() > 0) {
-                    Collections.sort(productPrivilege);
-
-                    ProductPrivilege Privilege = new ProductPrivilege();
-                    Privilege.setContractProductId(Long.parseLong(product.getId()));
-                    //先删除之前采购商品ID对应的赠送
-                    productPrivilegeService.delete(Privilege);
-                    for (ProductPrivilege privilege : productPrivilege) {
-                        privilege.setContractProductId(productId);
-                        //增加新的赠送
-                        productPrivilegeService.save(privilege);
-                    }
-                }
-            }
-        }
-    }
-
-    @Transactional(readOnly = false)
-    public void delete(Contract contract) {
-        super.delete(contract);
-    }
-
-    @Transactional(readOnly = false)
-    public Contract selectContractById(String id) {
-
-        return null;
-    }
-
-    public Integer getFreePostFlagByContracId(String id) {
-        return contractDao.getFreePostFlagByContracId(id);
-    }
-
-    public List<Contract> getContractByNo(String no) {
-        return contractDao.getContractByNo(no);
-    }
-
-    public Double getUserMoneyByClubId(String contractId) {
-        return contractDao.getUserMoneyByClubId(contractId);
-    }
-}

src/main/java/com/caimei/modules/bulkpurchase/service/OrderProductService.java

@@ -1,117 +0,0 @@
-package com.caimei.modules.bulkpurchase.service;
-
-import java.util.Date;
-import java.util.List;
-
-import com.caimei.modules.bulkpurchase.entity.CmFinanceReceipts;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.caimei.modules.bulkpurchase.entity.OrderProduct;
-import com.caimei.modules.bulkpurchase.dao.OrderProductDao;
-
-/**
- * 订单商品Service
- *
- * @author jiangjunwen
- * @version 2017-04-07
- */
-@Service
-@Transactional(readOnly = true)
-public class OrderProductService extends CrudService<OrderProductDao, OrderProduct> {
-    @Autowired
-    private OrderProductDao orderProductDao;
-    public OrderProduct get(String id) {
-        return super.get(id);
-    }
-
-    public List<OrderProduct> findList(OrderProduct orderProduct) {
-        return super.findList(orderProduct);
-    }
-
-    public Page<OrderProduct> findPage(Page<OrderProduct> page, OrderProduct orderProduct) {
-        return super.findPage(page, orderProduct);
-    }
-
-    @Transactional(readOnly = false)
-    public void save(OrderProduct orderProduct) {
-        super.save(orderProduct);
-    }
-
-    @Transactional(readOnly = false)
-    public void delete(OrderProduct orderProduct) {
-        super.delete(orderProduct);
-    }
-
-    @Transactional(readOnly = false)
-    public void deleteByOrderId(String orderId) {
-        orderProductDao.deleteByOrderId(orderId);
-    }
-
-    public Integer findStipulateFee(Long contractId) {
-        return orderProductDao.findStipulateFee(contractId);
-    }
-
-    public List<OrderProduct> getWithorderId(String orderId){
-        return  orderProductDao.getWithorderId(orderId);
-    }
-
-    /**
-     * 通过订单ID获取订单商品并以供应商分组
-     * @param orderId
-     * @return
-     */
-    public List<OrderProduct> getWithorderIdGroupByShopId(String orderId){
-        return  orderProductDao.getWithorderIdGroupByShopId(orderId);
-    }
-
-
-    /**
-     * 通过供应商ID和订单ID统计订单商品表中对应供应商的应付总额
-     * @param orderId
-     * @return
-     */
-    public Double getTotalPay(String orderId,String shopId){
-        return  orderProductDao.getTotalPay(orderId,shopId);
-    }
-
-    /**
-     * 通过订单ID统计订单商品表中对应第三方的应付总额
-     * @param orderId
-     * @return
-     */
-    public Double totalOtherFee(String orderId){
-        return  orderProductDao.totalOtherFee(orderId);
-    }
-
-    public Double getCmTotalPay(String orderId){
-        return  orderProductDao.getCmTotalPay(orderId);
-    }
-
-    public OrderProduct getProductNameByOrderproductId(String productId) {
-        return orderProductDao.getProductNameByOrderproductId(productId);
-    }
-
-    public List<OrderProduct> findByOrderIdGroupByShopId(Integer orderId) {
-        return orderProductDao.findByOrderIdGroupByShopId(orderId);
-    }
-
-    @Transactional(readOnly = false)
-    public void updatePayStatus(String orderProductId,String payStatus,Date orderPayDate) {
-        orderProductDao.updatePayStatus(orderProductId,payStatus,orderPayDate);
-    }
-
-    @Transactional(readOnly = false)
-    public List<OrderProduct> findAllList(OrderProduct orderProduct) {
-        return orderProductDao.findAllList(orderProduct);
-    }
-
-    @Transactional(readOnly = false)
-    public void updateShopConfigFlag(String orderId) {
-        orderProductDao.updateShopConfigFlag(orderId);
-    }
-
-}

src/main/java/com/caimei/modules/bulkpurchase/service/OrderStagesProductService.java

@@ -1,30 +0,0 @@
-package com.caimei.modules.bulkpurchase.service;
-
-import com.caimei.modules.bulkpurchase.dao.OrderStagesDao;
-import com.caimei.modules.bulkpurchase.dao.OrderStagesProductDao;
-import com.caimei.modules.bulkpurchase.entity.OrderStages;
-import com.caimei.modules.bulkpurchase.entity.OrderStagesProduct;
-import com.thinkgem.jeesite.common.service.CrudService;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-/**
- * 分期订单商品Service
- * @author Lijun
- * @version 2017-8-22
- */
-@Service
-@Transactional(readOnly = true)
-public class OrderStagesProductService extends CrudService<OrderStagesProductDao,OrderStagesProduct> {
-   @Autowired
-   public OrderStagesProductDao orderStagesProductDao;
-
-   @Transactional(readOnly = false)
-   public List<OrderStagesProduct> findStagesProductBuyStagesId(@Param("stagesId") String stagesId){
-      return orderStagesProductDao.findStagesProductBuyStagesId(stagesId);
-   }
-}

src/main/java/com/caimei/modules/bulkpurchase/service/OrderStagesService.java

@@ -1,39 +0,0 @@
-package com.caimei.modules.bulkpurchase.service;
-
-import com.caimei.modules.bulkpurchase.dao.OrderStagesDao;
-import com.caimei.modules.bulkpurchase.entity.CmFinanceReceipts;
-import com.caimei.modules.bulkpurchase.entity.OrderStages;
-import com.thinkgem.jeesite.common.service.CrudService;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-/**
- * 分期订单Service
- * @author Lijun
- * @version 2017-8-22
- */
-@Service
-@Transactional(readOnly = true)
-public class OrderStagesService  extends CrudService<OrderStagesDao,OrderStages> {
-   @Autowired
-   public OrderStagesDao orderStagesDao;
-
-   @Transactional(readOnly = false)
-   public List<OrderStages> findStagesByOrderId(@Param("orderId") String orderId){
-      return orderStagesDao.findStagesByOrderId(orderId);
-   }
-
-   @Transactional(readOnly = false)
-   public List<OrderStages> findList(OrderStages orderStages){
-      return orderStagesDao.findList(orderStages);
-   }
-
-   @Transactional(readOnly = false)
-   public int  updateStatus(OrderStages orderStages) {
-      return orderStagesDao.updateStatus(orderStages);
-   }
-}

src/main/java/com/caimei/modules/bulkpurchase/service/ProductPrivilegeService.java

@@ -1,53 +0,0 @@
-package com.caimei.modules.bulkpurchase.service;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.caimei.modules.bulkpurchase.entity.ProductPrivilege;
-import com.caimei.modules.bulkpurchase.dao.ProductPrivilegeDao;
-
-/**
- * 赠送优惠信息Service
- *
- * @author jiangjunwen
- * @version 2017-03-31
- */
-@Service
-@Transactional(readOnly = true)
-public class ProductPrivilegeService extends CrudService<ProductPrivilegeDao, ProductPrivilege> {
-    @Autowired
-    private ProductPrivilegeDao productPrivilegeDao;
-
-    public ProductPrivilege get(String id) {
-        return super.get(id);
-    }
-
-    public List<ProductPrivilege> findList(ProductPrivilege productPrivilege) {
-        return super.findList(productPrivilege);
-    }
-
-    public Page<ProductPrivilege> findPage(Page<ProductPrivilege> page, ProductPrivilege productPrivilege) {
-        return super.findPage(page, productPrivilege);
-    }
-
-    @Transactional(readOnly = false)
-    public void save(ProductPrivilege productPrivilege) {
-        super.save(productPrivilege);
-    }
-
-    @Transactional(readOnly = false)
-    public void delete(ProductPrivilege productPrivilege) {
-        super.delete(productPrivilege);
-    }
-
-    public List<ProductPrivilege> findListByProductId(String contractProductId) {
-      return  productPrivilegeDao.findListByProductId(contractProductId);
-    }
-
-
-}

src/main/java/com/caimei/modules/bulkpurchase/service/PurchaseProductService.java

@@ -1,88 +0,0 @@
-package com.caimei.modules.bulkpurchase.service;
-
-import java.util.List;
-
-import com.caimei.modules.svip.entity.CmSvipProduct;
-import com.caimei.po.ProductLadderPrice;
-import com.thinkgem.jeesite.common.utils.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import com.caimei.modules.bulkpurchase.entity.PurchaseProduct;
-import com.caimei.modules.bulkpurchase.dao.PurchaseProductDao;
-
-/**
- * 大宗采购商品信息Service
- *
- * @author jiangjunwen
- * @version 2017-03-28
- */
-@Service
-@Transactional(readOnly = true)
-public class PurchaseProductService extends CrudService<PurchaseProductDao, PurchaseProduct> {
-    @Autowired
-    private PurchaseProductDao purchaseProductDao;
-
-    public PurchaseProduct get(String id) {
-        return super.get(id);
-    }
-
-    public List<PurchaseProduct> findList(PurchaseProduct purchaseProduct) {
-        return super.findList(purchaseProduct);
-    }
-
-    public Page<PurchaseProduct> findPage(Page<PurchaseProduct> page, PurchaseProduct purchaseProduct) {
-        return super.findPage(page, purchaseProduct);
-    }
-
-    public List<PurchaseProduct> findSencondProductPage(PurchaseProduct purchaseProduct) {
-        return purchaseProductDao.findSencondProductPage(purchaseProduct);
-    }
-
-
-    @Transactional(readOnly = false)
-    public void save(PurchaseProduct purchaseProduct) {
-        if(StringUtils.isEmpty(purchaseProduct.getDelFlag())){
-            purchaseProduct.setDelFlag(0 + "");
-        }
-        if (StringUtils.isEmpty(purchaseProduct.getTaxRate())) {
-            purchaseProduct.setTaxRate(0 + "");
-            purchaseProduct.setAddedValueTax(0 + "");
-        }
-        if (StringUtils.isEmpty(purchaseProduct.getCmFee())) {
-            purchaseProduct.setCmFee(0 + "");
-        }
-        if (StringUtils.isEmpty(purchaseProduct.getShopFee())) {
-            purchaseProduct.setShopFee(0 + "");
-        }
-        if (StringUtils.isEmpty(purchaseProduct.getOtherFee())) {
-            purchaseProduct.setOtherFee(0 + "");
-        }
-        super.save(purchaseProduct);
-    }
-
-    @Transactional(readOnly = false)
-    public void delete(PurchaseProduct purchaseProduct) {
-        super.delete(purchaseProduct);
-    }
-
-    public List<PurchaseProduct> getPurchaseProductByCtId(long contractId) {
-        List<PurchaseProduct> list=  purchaseProductDao.getPurchaseProductByCtId(contractId);
-        return list;
-    }
-
-    public Integer findCount(String id) {
-       return purchaseProductDao.findCount(id);
-    }
-
-	public List<ProductLadderPrice> findLadderPriceList(Long productId){
-	    return purchaseProductDao.findLadderPriceList(productId);
-	}
-
-    public CmSvipProduct getSvipProduct(Long productId, Integer userId) {
-        return purchaseProductDao.getSvipProduct(productId, userId);
-    }
-}

src/main/java/com/caimei/modules/bulkpurchase/service/ReceiptListService.java

@@ -1,24 +0,0 @@
-package com.caimei.modules.bulkpurchase.service;
-
-import com.caimei.modules.bulkpurchase.entity.PurchaseProduct;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import com.caimei.modules.bulkpurchase.entity.ReceiptList;
-import com.caimei.modules.bulkpurchase.dao.ReceiptListDao;
-
-/**
- * 收款列表Service
- * @author lijun
- * @version 2017-06-05
- */
-@Service
-@Transactional(readOnly = true)
-public class ReceiptListService extends CrudService<ReceiptListDao, ReceiptList> {
-
-    public Page<ReceiptList> findPage(Page<ReceiptList> page, ReceiptList receiptList) {
-        return super.findPage(page, receiptList);
-    }
-
-}

src/main/java/com/caimei/modules/bulkpurchase/service/ShouldPayService.java

@@ -1,38 +0,0 @@
-package com.caimei.modules.bulkpurchase.service;
-
-import com.caimei.modules.bulkpurchase.dao.ShouldPayDao;
-import com.caimei.modules.bulkpurchase.entity.*;
-import com.thinkgem.jeesite.common.persistence.Page;
-import com.thinkgem.jeesite.common.service.CrudService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-/**
- * 应付列表Service
- *
- * @author ZCP
- * @version 2017-06-06
- */
-@Service
-@Transactional(readOnly = true)
-public class ShouldPayService extends CrudService<ShouldPayDao, ShouldPay> {
-    @Autowired
-    private ShouldPayDao shouldPayDao;
-
-    public ShouldPay get(String id) {
-        ShouldPay shouldPay = super.get(id);
-        return shouldPay;
-    }
-
-    public List<ShouldPay> findList(ShouldPay ShouldPay) {
-        return super.findList(ShouldPay);
-    }
-
-    public Page<ShouldPay> findPage(Page<ShouldPay> page, ShouldPay ShouldPay) {
-        return super.findPage(page, ShouldPay);
-    }
-
-}

src/main/java/com/caimei/modules/bulkpurchase/web/BpClauseController.java

@@ -2,7 +2,6 @@ package com.caimei.modules.bulkpurchase.web;
 
 import com.caimei.modules.bulkpurchase.entity.BpClause;
 import com.caimei.modules.bulkpurchase.service.BpClauseService;
-import com.caimei.modules.bulkpurchase.service.ContractOrderService;
 import com.google.common.collect.Maps;
 import com.thinkgem.jeesite.common.config.Global;
 import com.thinkgem.jeesite.common.persistence.Page;

src/main/java/com/caimei/modules/bulkpurchase/web/BpOrderCirculationController.java

@@ -1,93 +0,0 @@
-package com.caimei.modules.bulkpurchase.web;
-
-import com.caimei.modules.bulkpurchase.entity.BpOrderCirculation;
-import com.caimei.modules.bulkpurchase.service.BpOrderCirculationService;
-import com.thinkgem.jeesite.common.config.Global;
-import com.thinkgem.jeesite.common.utils.StringUtils;
-import com.thinkgem.jeesite.common.web.BaseController;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-/**
- * .订单传阅
- * @author ZCP
- * @version 2017-08-03
- **/
-
-@Controller
-@RequestMapping(value = "${adminPath}/bulkpurchase/bpOrderCirculation")
-public class BpOrderCirculationController extends BaseController {
-
-    @Autowired
-    private BpOrderCirculationService bpOrderCirculationService;
-
-    @ModelAttribute
-    public BpOrderCirculation get(@RequestParam(required=false) String userId) {
-        BpOrderCirculation entity = null;
-        if (StringUtils.isNotBlank(userId)){
-            entity = bpOrderCirculationService.get(userId);
-        }
-        if (entity == null){
-            entity = new BpOrderCirculation();
-        }
-        return entity;
-    }
-
-    /**
-     * 查询所有
-     * @param bpOrderCirculation
-     * @param request
-     * @param response
-     * @param model
-     * @return
-     */
-    @RequiresPermissions("ordercirculation:bpOrderCirculation:view")
-    @RequestMapping(value = {"list", ""})
-    public String list(BpOrderCirculation bpOrderCirculation, HttpServletRequest request, HttpServletResponse response, Model model) {
-        List<BpOrderCirculation> list = bpOrderCirculationService.findAllList(bpOrderCirculation);
-        model.addAttribute("list", list);
-        return "modules/bulkpurchase/bpOrderCirculationList";
-    }
-
-    /**
-     * 删除一条数据
-     * @param id
-     * @param redirectAttributes
-     * @return
-     */
-    @RequiresPermissions("ordercirculation:bpOrderCirculation:delete")
-    @RequestMapping(value = "delete")
-    public String delete(String id , RedirectAttributes redirectAttributes) {
-        try{
-            bpOrderCirculationService.delete(Long.parseLong(id));
-            addMessage(redirectAttributes, "删除成功");
-        }catch (Exception e){
-            addMessage(redirectAttributes, "删除失败"+e.getMessage());
-        }
-        return "redirect:"+ Global.getAdminPath()+"/bulkpurchase/bpOrderCirculation/?repage";
-    }
-
-    /**
-     * 更新
-     * @return
-     */
-    @RequiresPermissions("ordercirculation:bpOrderCirculation:edit")
-    @RequestMapping(value = "update")
-    public String update(String userId, String buyerRole, String shopRole) {
-        if (StringUtils.isNotBlank(userId) && StringUtils.isNotBlank(buyerRole) && StringUtils.isNotBlank(shopRole)) {
-            bpOrderCirculationService.update(userId, buyerRole, shopRole);
-        }
-        return "redirect:"+ Global.getAdminPath()+"/bulkpurchase/bpOrderCirculation/?repage";
-    }
-
-}