Merge remote-tracking branch 'remotes/origin/developer' into developerB

src/main/java/com/caimei/modules/order/entity/NewOrder.java

@@ -18,6 +18,7 @@ public class NewOrder extends DataEntity<NewOrder> {
     private Integer userID;              // bigint(11), 订单归属人
     //采美组织: 默认为null,具体对应cm_mall_organize表ID
     private Integer organizeID;
+    private Integer organizeStoreId;    // 组织门店id
     private String shopOrderIDs;        // varchar(100) comment '子订单ID',
     private String orderSubmitType;     // char(2) comment '订单提交类型',
     private String status;      // char(2) comment '订单状态'
@@ -130,6 +131,7 @@ public class NewOrder extends DataEntity<NewOrder> {
     private String rebateFlag;//返佣订单标识，0非返佣订单，1返佣订单
     private String associationType;//订单关联方式: 1手动 2自动
     private Double ableUserMoney; //当前下单用户可用余额
+    private String organizeStoreName;//组织门店名称
 
     public List<CmPromotion> getPromotions() {
         return promotions;
@@ -1001,5 +1003,21 @@ public class NewOrder extends DataEntity<NewOrder> {
     public void setAbleUserMoney(Double ableUserMoney) {
         this.ableUserMoney = ableUserMoney;
     }
+
+    public Integer getOrganizeStoreId() {
+        return organizeStoreId;
+    }
+
+    public void setOrganizeStoreId(Integer organizeStoreId) {
+        this.organizeStoreId = organizeStoreId;
+    }
+
+    public String getOrganizeStoreName() {
+        return organizeStoreName;
+    }
+
+    public void setOrganizeStoreName(String organizeStoreName) {
+        this.organizeStoreName = organizeStoreName;
+    }
 }
 

src/main/java/com/caimei/modules/order/service/CmRefundShopService.java

@@ -131,7 +131,8 @@ public class CmRefundShopService extends CrudService<CmRefundShopDao, CmRefundSh
                 } else {
                     so.setRefundsAmount(0d);
                 }
-                refundAmount += (so.getPayedShopAmount() - so.getRefundsAmount() - so.getShouldPayShopAmount());
+                BigDecimal payAmount = MathUtil.sub(so.getPayedShopAmount(), MathUtil.add(so.getRefundsAmount(), so.getShouldPayShopAmount()));
+                refundAmount = MathUtil.add(refundAmount, payAmount).doubleValue();
                 List<NewOrderProduct> orderProductList = newOrderProductDao.findByShopOrderID(so.getShopOrderID());
                 /*
                  1. 若发生退货，数量要减去已退货和已取消的数量

src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -684,24 +684,33 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
     }
 
     public boolean getSendSms(int markId, String mobile, String content) throws Exception {
-        if (org.apache.commons.lang.StringUtils.isNotBlank(mobile) && mobile.length() == 11) {
-            String regex = "^(1[3-9]\\d{9}$)";
-            Pattern pattern = Pattern.compile(regex);
-            Matcher matcher = pattern.matcher(mobile);
-            if (matcher.matches()) {
-                Map<String, Object> map = new HashMap<>(2);
-                map.put("content", content);
-                map.put("mobile", mobile);
-                String coreServer = Global.getConfig("caimei.core");
-                String url = coreServer + "/tools/sms/send";
-                String result = HttpRequest.sendPost(url, map);
-                JSONObject parseObject = JSONObject.parseObject(result);
-                Integer code = parseObject.getInteger("code");
-                if (code != 0) {
-                    logger.info("短信发送失败,手机号>>>>" + mobile);
-                } else {
-                    newOrderDao.updateSendNum(markId, 1);
-                    return true;
+        String config = Global.getConfig("cm.config");
+        //测试环境手机号允许发短信
+        List<String> list = new ArrayList<>();
+        list.add("15917362709");
+        list.add("15814011616");
+        list.add("13100721916");
+        list.add("15113936829");
+        if (config.equals("product") || list.contains(mobile)) {
+            if (StringUtils.isNotBlank(mobile) && mobile.length() == 11) {
+                String regex = "^(1[3-9]\\d{9}$)";
+                Pattern pattern = Pattern.compile(regex);
+                Matcher matcher = pattern.matcher(mobile);
+                if (matcher.matches()) {
+                    Map<String, Object> map = new HashMap<>(2);
+                    map.put("content", content);
+                    map.put("mobile", mobile);
+                    String coreServer = Global.getConfig("caimei.core");
+                    String url = coreServer + "/tools/sms/send";
+                    String result = HttpRequest.sendPost(url, map);
+                    JSONObject parseObject = JSONObject.parseObject(result);
+                    Integer code = parseObject.getInteger("code");
+                    if (code != 0) {
+                        logger.info("短信发送失败,手机号>>>>" + mobile);
+                    } else {
+                        newOrderDao.updateSendNum(markId, 1);
+                        return true;
+                    }
                 }
             }
         }

src/main/java/com/caimei/modules/order/web/CmPayShopController.java

@@ -123,7 +123,7 @@ public class CmPayShopController extends BaseController {
     public String saveChangePayShopAmount(NewShopOrder newShopOrder) {
         String shopOrderID = newShopOrder.getId();
         Double freight = newShopOrder.getShopPostFee();
-        Double thirdPartyFee = newShopOrder.getShopOtherFee();
+        Double thirdPartyFee = newShopOrder.getShopOtherFee() == null ? 0d : newShopOrder.getShopOtherFee();
         String costType = newShopOrder.getCostType();
         Double proportional = newShopOrder.getProportional();
         if (null == proportional) {
@@ -224,7 +224,8 @@ public class CmPayShopController extends BaseController {
             cmChangePayShopRecond.setRemarkImage(substring);
         }
         cmChangePayShopRecondService.save(cmChangePayShopRecond);
-        if (!shopOrder.getShopOtherFee().equals(thirdPartyFee)) {
+        double shopOtherFee = shopOrder.getShopOtherFee() == null ? 0d : shopOrder.getShopOtherFee();
+        if (shopOtherFee != thirdPartyFee) {
             //保存付第三方备注
             ChangePayShopOther payShopOther = new ChangePayShopOther();
             payShopOther.setShopOrderId(newShopOrder.getShopOrderID());

src/main/java/com/caimei/modules/order/web/NewOrderController.java

@@ -1213,6 +1213,11 @@ public class NewOrderController extends BaseController {
                 }
             }
         }
+        //商城小程序下单时，获取下单门店的名称
+        if (order.getOrganizeID() >= 3 && order.getOrganizeStoreId() != null) {
+            String organizeStoreName = cmUserDao.getOrganizeStoreName(order.getOrganizeStoreId());
+            order.setOrganizeStoreName(organizeStoreName);
+        }
 
         model.addAttribute("order", order);
         if ("0".equals(order.getStatus())) {

src/main/java/com/caimei/modules/user/dao/CmUserDao.java

@@ -72,4 +72,7 @@ public interface CmUserDao extends CrudDao<CmUser> {
      */
     void updateUserBeans(@Param("userID") Integer userID, @Param("userBeans") int userBeans);
 
+    CmUser findUserByOrganizeId(Integer organizeId);
+
+    String getOrganizeStoreName(Integer organizeStoreId);
 }

src/main/java/com/caimei/modules/user/web/newUser/AgencyController.java

@@ -529,7 +529,8 @@ public class AgencyController extends BaseController {
                 //审核通过升级为会员机构
                 companyUser.setUserIdentity(2);
                 smsMessage = "恭喜您成功升级为会员机构！立马登录采美365网享受享受更多更好的服务吧~";
-                companyUser.setUserBeans(companyUser.getUserBeans() + 20);
+                int userBeans = companyUser.getUserBeans() == null ? 0 : companyUser.getUserBeans();
+                companyUser.setUserBeans(userBeans + 20);
             } else {
                 //审核未通过,普通机构权限
                 userPermission = 5;

src/main/java/com/caimei/modules/weisha/dao/CmOrganizeStoreDao.java

@@ -0,0 +1,20 @@
+package com.caimei.modules.weisha.dao;
+
+import com.thinkgem.jeesite.common.persistence.CrudDao;
+import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
+import com.caimei.modules.weisha.entity.CmOrganizeStore;
+
+import java.util.List;
+
+/**
+ * 采美组织门店DAO接口
+ * @author Aslee
+ * @version 2021-06-29
+ */
+@MyBatisDao
+public interface CmOrganizeStoreDao extends CrudDao<CmOrganizeStore> {
+
+    List<CmOrganizeStore> findListByMobile(CmOrganizeStore cmOrganizeStore);
+
+    String findOrganizeNameById(Integer organizeId);
+}

src/main/java/com/caimei/modules/weisha/entity/CmOrganizeStore.java

@@ -0,0 +1,166 @@
+package com.caimei.modules.weisha.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 Aslee
+ * @version 2021-06-29
+ */
+public class CmOrganizeStore extends DataEntity<CmOrganizeStore> {
+	
+	private static final long serialVersionUID = 1L;
+	private Integer organizeId;		// 组织id
+	private String name;		// 门店名称
+	private String linkMan;		// 联系人
+	private String mobile;		// 手机号
+	private Integer provinceId;		// 省id
+	private Integer cityId;		// 市id
+	private Integer townId;		// 区id
+	private String address;		// 详细地址
+	private Integer status;		// 门店状态：1已上线，2已下线
+	private Date addTime;		// 添加时间
+
+	private String startTime;	// 查询条件，开始时间
+	private String endTime;	// 查询条件，结束时间
+	private String provinceName;	//省
+	private String cityName;		//市
+	private String townName;		//区
+
+	public CmOrganizeStore() {
+		super();
+	}
+
+	public CmOrganizeStore(String id){
+		super(id);
+	}
+
+	public Integer getOrganizeId() {
+		return organizeId;
+	}
+
+	public void setOrganizeId(Integer organizeId) {
+		this.organizeId = organizeId;
+	}
+	
+	@Length(min=0, max=30, message="门店名称长度必须介于 0 和 30 之间")
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	@Length(min=0, max=15, message="联系人长度必须介于 0 和 15 之间")
+	public String getLinkMan() {
+		return linkMan;
+	}
+
+	public void setLinkMan(String linkMan) {
+		this.linkMan = linkMan;
+	}
+	
+	@Length(min=0, max=15, message="手机号长度必须介于 0 和 15 之间")
+	public String getMobile() {
+		return mobile;
+	}
+
+	public void setMobile(String mobile) {
+		this.mobile = mobile;
+	}
+	
+	public Integer getProvinceId() {
+		return provinceId;
+	}
+
+	public void setProvinceId(Integer provinceId) {
+		this.provinceId = provinceId;
+	}
+	
+	public Integer getCityId() {
+		return cityId;
+	}
+
+	public void setCityId(Integer cityId) {
+		this.cityId = cityId;
+	}
+	
+	public Integer getTownId() {
+		return townId;
+	}
+
+	public void setTownId(Integer townId) {
+		this.townId = townId;
+	}
+	
+	@Length(min=0, max=255, message="详细地址长度必须介于 0 和 255 之间")
+	public String getAddress() {
+		return address;
+	}
+
+	public void setAddress(String address) {
+		this.address = address;
+	}
+	
+	public Integer getStatus() {
+		return status;
+	}
+
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+	
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	public Date getAddTime() {
+		return addTime;
+	}
+
+	public void setAddTime(Date addTime) {
+		this.addTime = addTime;
+	}
+
+	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 getProvinceName() {
+		return provinceName;
+	}
+
+	public void setProvinceName(String provinceName) {
+		this.provinceName = provinceName;
+	}
+
+	public String getCityName() {
+		return cityName;
+	}
+
+	public void setCityName(String cityName) {
+		this.cityName = cityName;
+	}
+
+	public String getTownName() {
+		return townName;
+	}
+
+	public void setTownName(String townName) {
+		this.townName = townName;
+	}
+}

src/main/java/com/caimei/modules/weisha/service/CmOrganizeStoreService.java

@@ -0,0 +1,44 @@
+package com.caimei.modules.weisha.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.weisha.entity.CmOrganizeStore;
+import com.caimei.modules.weisha.dao.CmOrganizeStoreDao;
+
+/**
+ * 采美组织门店Service
+ * @author Aslee
+ * @version 2021-06-29
+ */
+@Service
+@Transactional(readOnly = true)
+public class CmOrganizeStoreService extends CrudService<CmOrganizeStoreDao, CmOrganizeStore> {
+
+	public CmOrganizeStore get(String id) {
+		return super.get(id);
+	}
+	
+	public List<CmOrganizeStore> findList(CmOrganizeStore cmOrganizeStore) {
+		return super.findList(cmOrganizeStore);
+	}
+	
+	public Page<CmOrganizeStore> findPage(Page<CmOrganizeStore> page, CmOrganizeStore cmOrganizeStore) {
+		return super.findPage(page, cmOrganizeStore);
+	}
+	
+	@Transactional(readOnly = false)
+	public void save(CmOrganizeStore cmOrganizeStore) {
+		super.save(cmOrganizeStore);
+	}
+	
+	@Transactional(readOnly = false)
+	public void delete(CmOrganizeStore cmOrganizeStore) {
+		super.delete(cmOrganizeStore);
+	}
+	
+}

src/main/java/com/caimei/modules/weisha/web/CmMallOrganizeController.java

@@ -1,11 +1,21 @@
 package com.caimei.modules.weisha.web;
 
+import com.caimei.modules.bulkpurchase.entity.CmClub;
+import com.caimei.modules.user.dao.CmUserDao;
+import com.caimei.modules.user.entity.CmUser;
+import com.caimei.modules.user.entity.NewCmClub;
+import com.caimei.modules.user.service.CmUserService;
+import com.caimei.modules.user.service.NewCmClubService;
 import com.caimei.modules.weisha.entity.CmMallOrganize;
 import com.caimei.modules.weisha.service.CmMallOrganizeService;
+import com.caimei.utils.AppKeys;
+import com.caimei.utils.RandomCodeGenerator;
+import com.caimei.utils.StringUtil;
 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.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -16,6 +26,9 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 组织列表Controller
@@ -27,9 +40,18 @@ import javax.servlet.http.HttpServletResponse;
 @RequestMapping(value = "${adminPath}/weisha/cmMallOrganize")
 public class CmMallOrganizeController extends BaseController {
 
+    @Autowired
+    private CmUserDao cmUserDao;
+
     @Autowired
     private CmMallOrganizeService cmMallOrganizeService;
 
+    @Autowired
+    private CmUserService cmUserService;
+
+    @Autowired
+    private NewCmClubService newCmClubService;
+
     @ModelAttribute
     public CmMallOrganize get(@RequestParam(required = false) String id) {
         CmMallOrganize entity = null;
@@ -60,12 +82,87 @@ public class CmMallOrganizeController extends BaseController {
         if (!beanValidator(model, cmMallOrganize)) {
             return form(cmMallOrganize, model);
         }
-        CmMallOrganize organize = cmMallOrganizeService.findOrganizeMobileOnly(cmMallOrganize);
-        if (organize != null) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String currentDate = sdf.format(new Date());
+        CmUser cmUser = new CmUser();
+        NewCmClub newCmClub = new NewCmClub();
+        if (StringUtils.isNotEmpty(cmMallOrganize.getId())) {
+            cmUser = cmUserDao.findUserByOrganizeId(Integer.parseInt(cmMallOrganize.getId()));
+            newCmClub = newCmClubService.getclubByUserId(cmUser.getUserID());
+        }
+        //判断该会所手机号是否已存在
+        cmUser.setBindMobile(cmMallOrganize.getMobile());
+        newCmClub.setCheckTime(null);
+        List<CmUser> listBuyBindMobile = cmUserService.findListBuyBindMobile(cmUser);
+        if (CollectionUtils.isNotEmpty(listBuyBindMobile) && listBuyBindMobile.size() > 0) {
             addMessage(model, "手机号重复，请更换手机号");
             return form(cmMallOrganize, model);
         }
         cmMallOrganizeService.save(cmMallOrganize);
+
+        //添加用户信息（新增或修改通用）
+        cmUser.setUserOrganizeID(Integer.parseInt(cmMallOrganize.getId()));
+        cmUser.setName(cmMallOrganize.getOrganizeName());
+        cmUser.setLinkMan(cmMallOrganize.getOrganizeLinkName());
+        cmUser.setUserName(cmMallOrganize.getOrganizeLinkName());
+        newCmClub.setName(cmMallOrganize.getOrganizeName());
+        newCmClub.setLinkMan(cmMallOrganize.getOrganizeLinkName());
+        newCmClub.setContractMobile(cmMallOrganize.getMobile());
+        if (StringUtil.isNotBlank(cmMallOrganize.getOrganizeName())) {
+            //添加用户新增信息
+            if (null == cmUser.getUserID()) {//新增
+                cmUser.setClubStatus("1".equals(cmMallOrganize.getStatus()) ? "90" : "91");
+                cmUser.setRegisterUserTypeID("4");//设置为会所
+                cmUser.setUserIdentity(4);
+                cmUser.setServiceProviderStatus("90");//设置默认协销状态
+                cmUser.setServiceProviderID("1342");
+                cmUser.setAuditTime(currentDate);
+                cmUser.setAuditStatus("1");//审核通过
+                cmUser.setAuditNote("后台添加用户系统默认审核通过");
+                cmUser.setRegisterTime(currentDate);
+                cmUser.setLoginTime(currentDate);
+                cmUser.setAccount(cmMallOrganize.getMobile() + RandomCodeGenerator.generateAccount(2));
+                cmUser.setPassword("weisha");
+                cmUser.setBindMobile(cmMallOrganize.getMobile());
+                cmUser.setUserMoney(0d);
+                cmUser.setAbleUserMoney(0d);
+                cmUser.setValidFlag("1");
+                cmUser.setAgreeFlag("1");
+                cmUser.setUserLevelID("1");
+                cmUser.setUserPermission(5);
+                cmUserService.insert(cmUser);//插入新的用户数据
+            }
+            //添加会所表信息
+            if (null == newCmClub.getClubID()) {
+                newCmClub.setStatus("1".equals(cmMallOrganize.getStatus()) ? 90 : 91);
+                newCmClub.setUserID(cmUser.getUserID());
+                newCmClub.setDefaultServiceProviderID(AppKeys.DEFAULT_SPID);
+                newCmClub.setSpID(AppKeys.DEFAULT_SPID);
+                newCmClub.setMainServiceProviderID(AppKeys.DEFAULT_SPID);
+                newCmClub.setAddTime(currentDate);
+                newCmClub.setLinkMan1(newCmClub.getLinkMan());
+                newCmClub.setContractMobile1(newCmClub.getContractMobile());
+                newCmClub.setLevel(0d);
+                newCmClub.setSubClubCount(0);
+                newCmClub.setFavoriteTimes(0);
+                newCmClub.setClubTypeID(1);
+                newCmClub.setDefaultServiceProviderUpdTime(currentDate);
+                newCmClubService.insert(newCmClub);
+
+                //更新用户绑定关系
+                cmUser.setClubID(String.valueOf(newCmClub.getClubID()));
+                String nick = cmUser.getUserID() + "_" + RandomCodeGenerator.generateCodeString(4).toLowerCase();
+                cmUser.setNick(nick);
+                cmUser.setCompanyUserID(cmUser.getUserID());
+
+                //更新会所绑定关系
+                newCmClub.setUserID(cmUser.getUserID());
+            }
+            cmUserService.update(cmUser);//更新用户表数据(编辑数据，或新增数据更新)
+
+            newCmClubService.update(newCmClub);//更新会所表数据(编辑数据，或新增数据更新)
+        }
+
         addMessage(redirectAttributes, "保存组织成功");
         return "redirect:" + Global.getAdminPath() + "/weisha/cmMallOrganize/?repage";
     }

src/main/java/com/caimei/modules/weisha/web/CmOrganizeStoreController.java

@@ -0,0 +1,132 @@
+package com.caimei.modules.weisha.web;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.caimei.modules.common.dao.AreaDao;
+import com.caimei.modules.common.entity.City;
+import com.caimei.modules.common.entity.Province;
+import com.caimei.modules.common.entity.Town;
+import com.caimei.modules.weisha.dao.CmOrganizeStoreDao;
+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.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.weisha.entity.CmOrganizeStore;
+import com.caimei.modules.weisha.service.CmOrganizeStoreService;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 采美组织门店Controller
+ * @author Aslee
+ * @version 2021-06-29
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/weisha/cmOrganizeStore")
+public class CmOrganizeStoreController extends BaseController {
+
+	@Autowired
+	private CmOrganizeStoreService cmOrganizeStoreService;
+
+	@Resource
+	private CmOrganizeStoreDao cmOrganizeStoreDao;
+
+	@Autowired
+	private AreaDao areaDao;
+
+
+	@ModelAttribute
+	public CmOrganizeStore get(@RequestParam(required=false) String id) {
+		CmOrganizeStore entity = null;
+		if (StringUtils.isNotBlank(id)){
+			entity = cmOrganizeStoreService.get(id);
+		}
+		if (entity == null){
+			entity = new CmOrganizeStore();
+		}
+		return entity;
+	}
+	
+	@RequestMapping(value = {"list", ""})
+	public String list(CmOrganizeStore cmOrganizeStore, HttpServletRequest request, HttpServletResponse response, Model model) {
+		if (null != cmOrganizeStore.getStartTime() && !"".equals(cmOrganizeStore.getStartTime()) && !cmOrganizeStore.getStartTime().endsWith("00:00:00")) {
+			model.addAttribute("startTime", cmOrganizeStore.getStartTime());
+			cmOrganizeStore.setStartTime(cmOrganizeStore.getStartTime().trim() + " 00:00:00");
+		}
+		if (null != cmOrganizeStore.getEndTime() && !"".equals(cmOrganizeStore.getEndTime()) && !cmOrganizeStore.getEndTime().endsWith("23:59:59")) {
+			model.addAttribute("endTime", cmOrganizeStore.getEndTime());
+			cmOrganizeStore.setEndTime(cmOrganizeStore.getEndTime().trim() + " 23:59:59");
+		}
+		Page<CmOrganizeStore> page = cmOrganizeStoreService.findPage(new Page<CmOrganizeStore>(request, response), cmOrganizeStore); 
+		model.addAttribute("page", page);
+		String organizeName = cmOrganizeStoreDao.findOrganizeNameById(cmOrganizeStore.getOrganizeId());
+		model.addAttribute("organizeName", organizeName);
+		return "modules/weisha/cmOrganizeStoreList";
+	}
+
+	@RequestMapping(value = "form")
+	public String form(CmOrganizeStore cmOrganizeStore, Model model) {
+		model.addAttribute("cmOrganizeStore", cmOrganizeStore);
+		Integer provinceId = cmOrganizeStore.getProvinceId();
+		Integer townId = cmOrganizeStore.getTownId();
+		Integer cityId = cmOrganizeStore.getCityId();
+		//控制编辑异常时候的会显地址下拉框
+		if (null != provinceId && provinceId > 0) {
+			Province province = areaDao.loadProvinceById(provinceId);
+			cmOrganizeStore.setProvinceName(province.getName());
+		}
+		if (null != cityId && cityId > 0) {
+			City city = areaDao.loadCityById(cityId);
+			cmOrganizeStore.setCityName(city.getName());
+		}
+		if (null != townId && townId > 0) {
+			Town town = areaDao.loadTownByID(townId);
+			cmOrganizeStore.setTownName(town.getName());
+		}
+		return "modules/weisha/cmOrganizeStoreForm";
+	}
+
+	@RequestMapping(value = "save")
+	public String save(CmOrganizeStore cmOrganizeStore, Model model, RedirectAttributes redirectAttributes) {
+		if (!beanValidator(model, cmOrganizeStore)){
+			return form(cmOrganizeStore, model);
+		}
+		// 判断手机号是否存在
+		List<CmOrganizeStore> storeList = cmOrganizeStoreDao.findListByMobile(cmOrganizeStore);
+		if (null != storeList && storeList.size() > 0) {
+			addMessage(model, "手机号重复，请更换手机号");
+			return form(cmOrganizeStore, model);
+		}
+		if (null == cmOrganizeStore.getOrganizeId()) {
+			addMessage(model, "组织id不能为空");
+			return form(cmOrganizeStore, model);
+		}
+		if (StringUtils.isEmpty(cmOrganizeStore.getId())) {
+			cmOrganizeStore.setAddTime(new Date());
+			cmOrganizeStore.setStatus(1);
+		}
+		cmOrganizeStoreService.save(cmOrganizeStore);
+		return "redirect:" + Global.getAdminPath() + "/weisha/cmOrganizeStore/?repage&organizeId=" + cmOrganizeStore.getOrganizeId();
+	}
+	
+	@RequestMapping(value = "delete")
+	public String delete(CmOrganizeStore cmOrganizeStore, RedirectAttributes redirectAttributes) {
+		cmOrganizeStoreService.delete(cmOrganizeStore);
+		addMessage(redirectAttributes, "删除门店成功");
+		return "redirect:"+Global.getAdminPath()+"/weisha/cmOrganizeStore/?repage";
+	}
+
+}

src/main/resources/mappings/modules/order/OrderMapper.xml

@@ -57,7 +57,8 @@
 		a.promotionalGiftsCount AS promotionalGiftsCount,
 		a.affirmPaymentFlag AS affirmPaymentFlag,
 		a.rebateFlag AS rebateFlag,
-		a.zeroCostFlag AS zeroCostFlag
+		a.zeroCostFlag AS zeroCostFlag,
+		a.organizeStoreId as organizeStoreId
 	</sql>
 
     <select id="get" resultType="newOrder">

src/main/resources/mappings/modules/user/CmUserMapper.xml

@@ -783,4 +783,14 @@
 	<update id="updateUserBeans">
 		UPDATE USER SET userBeans = #{userBeans} WHERE userID = #{userID}
 	</update>
+	<select id="findUserByOrganizeId" resultType="com.caimei.modules.user.entity.CmUser">
+		SELECT
+		<include refid="cmUserColumns"/>
+		FROM user a
+		WHERE a.userOrganizeID=#{organizeId}
+		limit 1
+	</select>
+	<select id="getOrganizeStoreName" resultType="java.lang.String">
+		select name from cm_organize_store where id = #{organizeStoreId}
+	</select>
 </mapper>

src/main/resources/mappings/modules/user/NewCmClubMapper.xml

@@ -180,7 +180,7 @@
 			<if test="userIdentity != null and userIdentity != ''">
 				AND u.userIdentity = #{userIdentity}
 			</if>
-			AND u.userOrganizeID IN(0,1)
+			AND (u.userOrganizeID IN(0,1) or u.clubStatus != 92)
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">

src/main/resources/mappings/modules/weisha/CmOrganizeStoreMapper.xml

@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.caimei.modules.weisha.dao.CmOrganizeStoreDao">
+    
+	<sql id="cmOrganizeStoreColumns">
+		a.id AS "id",
+		a.organizeId AS "organizeId",
+		a.name AS "name",
+		a.linkMan AS "linkMan",
+		a.mobile AS "mobile",
+		a.provinceId AS "provinceId",
+		a.cityId AS "cityId",
+		a.townId AS "townId",
+		a.address AS "address",
+		a.status AS "status",
+		a.addTime AS "addTime"
+	</sql>
+	
+	<sql id="cmOrganizeStoreJoins">
+	</sql>
+    
+	<select id="get" resultType="CmOrganizeStore">
+		SELECT 
+			<include refid="cmOrganizeStoreColumns"/>
+		FROM cm_organize_store a
+		<include refid="cmOrganizeStoreJoins"/>
+		WHERE a.id = #{id}
+	</select>
+	
+	<select id="findList" resultType="CmOrganizeStore">
+		SELECT 
+			<include refid="cmOrganizeStoreColumns"/>
+		FROM cm_organize_store a
+		<include refid="cmOrganizeStoreJoins"/>
+		<where>
+			
+			<if test="name != null and name != ''">
+				AND a.name LIKE 
+					<if test="dbName == 'oracle'">'%'||#{name}||'%'</if>
+					<if test="dbName == 'mssql'">'%'+#{name}+'%'</if>
+					<if test="dbName == 'mysql'">concat('%',#{name},'%')</if>
+			</if>
+			<if test="linkMan != null and linkMan != ''">
+				AND a.linkMan LIKE 
+					<if test="dbName == 'oracle'">'%'||#{linkMan}||'%'</if>
+					<if test="dbName == 'mssql'">'%'+#{linkMan}+'%'</if>
+					<if test="dbName == 'mysql'">concat('%',#{linkMan},'%')</if>
+			</if>
+			<if test="mobile != null and mobile != ''">
+				AND a.mobile LIKE 
+					<if test="dbName == 'oracle'">'%'||#{mobile}||'%'</if>
+					<if test="dbName == 'mssql'">'%'+#{mobile}+'%'</if>
+					<if test="dbName == 'mysql'">concat('%',#{mobile},'%')</if>
+			</if>
+			<if test="status != null and status != ''">
+				AND a.status = #{status}
+			</if>
+			<if test="startTime != null and startTime != ''">
+				AND a.addTime >= #{startTime}
+			</if>
+			<if test="endTime != null and endTime != ''">
+				AND a.addTime <![CDATA[   <=  ]]> #{endTime}
+			</if>
+			<if test="organizeId != null">
+				and a.organizeId = #{organizeId}
+			</if>
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				order by a.addTime desc
+			</otherwise>
+		</choose>
+	</select>
+	
+	<select id="findAllList" resultType="CmOrganizeStore">
+		SELECT 
+			<include refid="cmOrganizeStoreColumns"/>
+		FROM cm_organize_store a
+		<include refid="cmOrganizeStoreJoins"/>
+		<where>
+			
+		</where>		
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+                order by a.addTime desc
+			</otherwise>
+		</choose>
+	</select>
+	<select id="findListByMobile" resultType="com.caimei.modules.weisha.entity.CmOrganizeStore">
+		select
+			<include refid="cmOrganizeStoreColumns"/>
+		from cm_organize_store a
+		where a.mobile = #{mobile}
+		<if test="id != null and id != ''">
+			and a.id != #{id}
+		</if>
+	</select>
+	<select id="findOrganizeNameById" resultType="java.lang.String">
+		select organizeName from cm_mall_organize where id = #{organizeId}
+	</select>
+
+	<insert id="insert" parameterType="CmOrganizeStore"  keyProperty="id" useGeneratedKeys="true">
+		INSERT INTO cm_organize_store(
+			organizeId,
+			name,
+			linkMan,
+			mobile,
+			provinceId,
+			cityId,
+			townId,
+			address,
+			status,
+			addTime
+		) VALUES (
+			#{organizeId},
+			#{name},
+			#{linkMan},
+			#{mobile},
+			#{provinceId},
+			#{cityId},
+			#{townId},
+			#{address},
+			#{status},
+			#{addTime}
+		)
+	</insert>
+	
+	<update id="update">
+		UPDATE cm_organize_store SET 	
+			organizeId = #{organizeId},
+			name = #{name},
+			linkMan = #{linkMan},
+			mobile = #{mobile},
+			provinceId = #{provinceId},
+			cityId = #{cityId},
+			townId = #{townId},
+			address = #{address},
+			status = #{status}
+		WHERE id = #{id}
+	</update>
+	
+	<delete id="delete">
+		DELETE FROM cm_organize_store
+		WHERE id = #{id}
+	</delete>
+	
+</mapper>

src/main/webapp/WEB-INF/views/modules/bulkpurchase/applyRefoundForm.jsp

@@ -288,7 +288,7 @@
                     <c:if test="${returnOnline}">
                         <input class="check-item-review refundOnlineFee" type="radio"   name="returnedWay" value='2'/>
                         线上退回
-                        <c:if test="${empty order.rechargeGoods && order.organizeID eq 0}">
+                        <c:if test="${empty order.rechargeGoods}">
                             <input class="check-item-review refundBalanceFee" type="radio"  name="returnedWay" value='1'/>
                             账户余额
                         </c:if>
@@ -297,7 +297,7 @@
                         <input class="check-item-review refundOfflineFee" type="checkbox"   name="returnedWay" value='3' onclick="showBankInfo()"/>
                         线下转账
                         <from:input path="refundOfflineFee" onkeyup="num(this)"   placeholder="￥0.00" value="${empty cmReturnedPurchase.refundOfflineFee?'':(cmReturnedPurchase.refundOfflineFee)}"></from:input>
-                        <c:if test="${empty order.rechargeGoods && order.organizeID eq 0}">
+                        <c:if test="${empty order.rechargeGoods}">
                             <input class="check-item-review refundBalanceFee" type="checkbox"  name="returnedWay" value='1'/>
                             账户余额
                             <from:input path="refundBalanceFee" onkeyup="num(this)" placeholder="￥0.00" value="${empty cmReturnedPurchase.refundBalanceFee?'':(cmReturnedPurchase.refundBalanceFee)}"></from:input>
@@ -423,7 +423,7 @@
         </tr>
         <tr>
             <td>
-            机构：${order.buyer}<c:if test="${order.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+            机构：${order.buyer}<c:if test="${order.organizeID == 3}"></c:if>
             </td>
             <td>
             收货人：${order.bpOrderUserinfo.shouHuoRen}(${order.bpOrderUserinfo.mobile})

src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderConfirmReturnRecord.jsp

@@ -324,7 +324,7 @@
     </tr>
     <tr>
         <td>
-            机构：${order.buyer}<c:if test="${order.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+            机构：${order.buyer}<c:if test="${order.organizeID == 3}"></c:if>
         </td>
         <td>
             收货人：${order.bpOrderUserinfo.shouHuoRen}(${order.bpOrderUserinfo.mobile})

src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderReturnRecord.jsp

@@ -442,7 +442,7 @@
             </tr>
             <tr>
                 <td>
-                    机构：${order.buyer}<c:if test="${order.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+                    机构：${order.buyer}<c:if test="${order.organizeID == 3}"></c:if>
                 </td>
                 <td>
                     收货人：${order.bpOrderUserinfo.shouHuoRen}(${order.bpOrderUserinfo.mobile})

src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderReviewReturnRecord.jsp

@@ -404,7 +404,7 @@
     </tr>
     <tr>
         <td>
-            机构：${order.buyer}<c:if test="${order.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+            机构：${order.buyer}<c:if test="${order.organizeID == 3}"></c:if>
         </td>
         <td>
             收货人：${order.bpOrderUserinfo.shouHuoRen}(${order.bpOrderUserinfo.mobile})

src/main/webapp/WEB-INF/views/modules/bulkpurchase/refundRecord.jsp

@@ -154,7 +154,7 @@
     </tr>
     <tr>
         <td>
-            机构：${order.bpOrderUserinfo.name}<c:if test="${order.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+            机构：${order.bpOrderUserinfo.name}<c:if test="${order.organizeID == 3}"></c:if>
         </td>
         <td>
             收货人：${order.bpOrderUserinfo.shouHuoRen}

src/main/webapp/WEB-INF/views/modules/hehe/heheNewOrderDetail.jsp

@@ -184,7 +184,7 @@
                 </c:if>
             </td>
         </c:if>
-        <td>机构：${order.buyer}<c:if test="${order.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if></td>
+        <td>机构：${order.buyer}<c:if test="${order.organizeID == 3}"></c:if></td>
         <td>收货人: ${order.bpOrderUserinfo.shouHuoRen}</td>
     </tr>
     <tr>

src/main/webapp/WEB-INF/views/modules/order/checkPaymentOrder.jsp

@@ -262,7 +262,7 @@
                             <font color="red">(呵呵商城)</font>
                         </c:if>
                         <c:if test="${s.organizeID == 3}">
-                            <em class="weishaIcon">维沙</em>
+
                         </c:if>
                     </td>
                     <td><fmt:formatNumber value="${s.discountFee}" type="number" pattern="#,##0.00"/></td>
@@ -311,10 +311,10 @@
                         </td>
                         <td colspan="2">
                             <fmt:formatNumber value="${so.shouldPayShopAmount}" type="number" pattern="#,##0.00"/>
-                            <c:if test="${so.differenceType eq 1 && s.differencePrice > 0}">
+                            <c:if test="${so.differenceType eq 1 && so.differencePrice > 0}">
                                 <font color="red">(需补差价￥${so.differencePrice})</font>
                             </c:if>
-                            <c:if test="${so.differenceType eq 2 && s.differencePrice > 0}">
+                            <c:if test="${so.differenceType eq 2 && so.differencePrice > 0}">
                                 <font color="red">(需退差价￥${so.differencePrice})</font>
                             </c:if>
                         </td>

src/main/webapp/WEB-INF/views/modules/order/cmDiscernReceiptForm.jsp

@@ -275,7 +275,7 @@
                                     </c:if>
                                         ${orderInfo.customerName}
                         <c:if test="${orderInfo.organizeID == 3}">
-                            <em class="weishaIcon">维沙</em>
+
                         </c:if>
                                 </span>
                     <span><label>订单状态：</label>
@@ -308,7 +308,14 @@
                                     <span>${receiptRecord.confirmUserName}确认(${receiptRecord.confirmDate})</span>
                                 </c:if>
                                 <c:if test="${not empty receiptRecord.reviewUserPermissionID}">
-                                    <span>${receiptRecord.reviewUserName}审核通过(${receiptRecord.reviewDate})</span>
+                                    <span>
+                                        <c:if test="${receiptRecord.receiptStatus eq 4}">
+                                            ${receiptRecord.reviewUserName}审核不通过(${receiptRecord.reviewDate})
+                                        </c:if>
+                                        <c:if test="${receiptRecord.receiptStatus ne 4}">
+                                            ${receiptRecord.reviewUserName}审核通过(${receiptRecord.reviewDate})
+                                        </c:if>
+                                    </span>
                                 </c:if>
                             </c:if>
                             <c:if test="${receiptRecord.payWay == 3}">

src/main/webapp/WEB-INF/views/modules/order/cmDiscernReceiptList.jsp

@@ -224,7 +224,7 @@
                     <font color="red">(呵呵商城)</font>
                 </c:if>
                 <c:if test="${cmDiscernReceipt.organizeID == 3}">
-                    <em class="weishaIcon">维沙</em>
+
                 </c:if>
             </td>
             <td>${cmDiscernReceipt.orderType}</td>

src/main/webapp/WEB-INF/views/modules/order/cmPayFormList.jsp

@@ -146,7 +146,7 @@
 							<span><font color="red">(呵呵商城)</font></span>
 						</c:if>
 						<c:if test="${shopOrder.organizeID == 3}">
-							<em class="weishaIcon">维沙</em>
+
 						</c:if><br>
 					</c:forEach>
 				</td>

src/main/webapp/WEB-INF/views/modules/order/cmPayShopCheck.jsp

@@ -144,7 +144,7 @@
 					</tr>
 					<tr>
 						<td>${s.shopName}</td>
-						<td colspan="3">${s.buyer}<c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if></td>
+						<td colspan="3">${s.buyer}<c:if test="${s.organizeID == 3}"></c:if></td>
 						<td>
                         <c:if test="${s.freight == 0}">
                             包邮

src/main/webapp/WEB-INF/views/modules/order/cmPayShopDetail.jsp

@@ -154,7 +154,7 @@
 					<td colspan="3">
 							${s.clubName}
 						<c:if test="${s.orderType eq 2}"><font color="red">(呵呵商城)</font></c:if>
-						<c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+						<c:if test="${s.organizeID == 3}"></c:if>
 					</td>
 					<td>
                         <c:if test="${s.freight == 0}">

src/main/webapp/WEB-INF/views/modules/order/cmPayShopEdit.jsp

@@ -140,7 +140,7 @@
                     </tr>
                     <tr>
                         <td>${s.shopName}</td>
-                        <td colspan="3">${s.buyer}<c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if></td>
+                        <td colspan="3">${s.buyer}<c:if test="${s.organizeID == 3}"></c:if></td>
                         <td>
                         <c:if test="${s.freight == 0}">
                             包邮

src/main/webapp/WEB-INF/views/modules/order/cmPayShopForm.jsp

@@ -168,7 +168,7 @@
 					<td colspan="3">
 							${s.buyer}
 						<c:if test="${s.orderType eq 2}"><font color="red">(呵呵商城)</font></c:if>
-						<c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if></td>
+						<c:if test="${s.organizeID == 3}"></c:if></td>
 					<td>
                         <c:if test="${s.freight == 0}">
                             包邮
@@ -253,8 +253,8 @@
 								</c:otherwise>
 							</c:choose></td>
 						<td colspan="2"><fmt:formatNumber value="${((empty p.touchPrice?p.discountPrice:p.touchPrice) + p.addedValueTax)*(p.num+p.presentNum-p.returnedNum)}" type="number" pattern="#,##0.00"/></td>
-						<td><fmt:formatNumber value="${p.discountPrice + p.addedValueTax - p.costPrice - p.singleShouldPayTotalTax}" pattern="#,##0.00"/></td>
-						<td class="payCm"><fmt:formatNumber value="${(p.discountPrice + p.addedValueTax - p.costPrice - p.singleShouldPayTotalTax) * (p.num + p.presentNum - p.returnedNum)}" pattern="#,##0.00"/></td>
+						<td><fmt:formatNumber value="${(empty p.touchPrice?p.discountPrice:p.touchPrice) + p.addedValueTax - p.costPrice - p.singleShouldPayTotalTax}" pattern="#,##0.00"/></td>
+						<td class="payCm"><fmt:formatNumber value="${((empty p.touchPrice?p.discountPrice:p.touchPrice) + p.addedValueTax - p.costPrice - p.singleShouldPayTotalTax) * (p.num + p.presentNum - p.returnedNum)}" pattern="#,##0.00"/></td>
                         <td class="p-taxes">${(p.includedTax ne '' and p.includedTax eq 0 and p.invoiceType eq 3)?'---':empty p.supplierTaxRate?0.0:p.supplierTaxRate}${(p.includedTax ne '' and p.includedTax eq 0 and p.invoiceType eq 3)?'':'%'}</td>
                         <td class="p-taxes">${(p.includedTax ne '' and (p.includedTax eq 1 or (p.includedTax eq 0 and p.invoiceType eq 3)))?'---': empty p.singleShouldPayTotalTax ?0.00:p.singleShouldPayTotalTax}</td>
                         <td class="p-taxes-t"><c:choose>

src/main/webapp/WEB-INF/views/modules/order/cmPayShopList.jsp

@@ -456,7 +456,7 @@
                         <c:if test="${s.organizeID eq 1}"><span class="org-note">星范</span></c:if>
                             ${s.clubName}
                         <c:if test="${s.orderType eq 2}"><font color="red">(呵呵商城)</font></c:if>
-                        <c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+                        <c:if test="${s.organizeID == 3}"></c:if>
                     </td>
                     <td>
                         <c:if test="${s.freight == 0}">

src/main/webapp/WEB-INF/views/modules/order/cmPayShopPrintDetail.jsp

@@ -146,7 +146,7 @@
 				</tr>
 				<tr>
 					<td>${s.shopName}</td>
-					<td colspan="3">${s.buyer}<c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if></td>
+					<td colspan="3">${s.buyer}<c:if test="${s.organizeID == 3}"></c:if></td>
 					<td>
                         <c:if test="${s.freight == 0}">
                             包邮

src/main/webapp/WEB-INF/views/modules/order/cmRefundRecordList.jsp

@@ -231,7 +231,7 @@
 					<td>${s.shopName}</td>
 					<td colspan="3">
 						<c:if test="${s.organizeID eq 1}"><span class="org-note">星范</span></c:if>
-						${s.clubName}<c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+						${s.clubName}<c:if test="${s.organizeID == 3}"></c:if>
 					</td>
 					<td>
                         <c:if test="${s.freight == 0}">

src/main/webapp/WEB-INF/views/modules/order/cmRefundShopDetail.jsp

@@ -144,7 +144,7 @@
 							<td>${s.shopName}</td>
 							<td colspan="3">
 								<c:if test="${s.organizeID == 1}"><span class="org-note">星范</span></c:if>
-									${s.buyer}<c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+									${s.buyer}<c:if test="${s.organizeID == 3}"></c:if>
 							</td>
 							<td>
 								<c:if test="${s.freight == 0}">

src/main/webapp/WEB-INF/views/modules/order/cmRefundShopForm.jsp

@@ -147,7 +147,7 @@
 					</tr>
 					<tr>
 						<td>${s.shopName}</td>
-						<td colspan="3">${s.buyer}<c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if></td>
+						<td colspan="3">${s.buyer}<c:if test="${s.organizeID == 3}"></c:if></td>
 						<td>
 							<c:if test="${s.freight == 0}">
 								包邮

src/main/webapp/WEB-INF/views/modules/order/cmReturnedPurchaseList.jsp

@@ -163,7 +163,7 @@
 					<c:if test="${cmReturnedPurchase.organizeID == 1}">
 						<span class="org-note">星范</span>
 					</c:if>
-						${cmReturnedPurchase.name}<c:if test="${cmReturnedPurchase.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+						${cmReturnedPurchase.name}<c:if test="${cmReturnedPurchase.organizeID == 3}"></c:if>
 				</td>
 				<td>${cmReturnedPurchase.orderNo}(${cmReturnedPurchase.orderID})</td>
 				<td><fmt:formatNumber type="number" pattern="#,##0.00"

src/main/webapp/WEB-INF/views/modules/order/newOrderList.jsp

@@ -913,7 +913,6 @@
                 </c:if>
 
                     ${order.buyer}
-                    <c:if test="${order.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
             </li>
             <li>${order.receiver}</li>
             <li>${fns:getDictLabel(order.orderSource,"bp_orderSource","" )}</li>

src/main/webapp/WEB-INF/views/modules/order/orderDetail.jsp

@@ -187,7 +187,8 @@
                 </c:if>
             </td>
         </c:if>
-        <td>机构：${order.buyer}<c:if test="${order.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if></td>
+        <td>机构：${order.buyer}<c:if test="${order.organizeID >= 3}"><label style="margin-left: 20px">门店：${order.organizeStoreName}</label> </c:if></td>
+
         <td>收货人: ${order.bpOrderUserinfo.shouHuoRen}</td>
     </tr>
     <tr>

src/main/webapp/WEB-INF/views/modules/order/payedAndRefundRecordList.jsp

@@ -118,7 +118,7 @@
             <td>${s.shopName}</td>
             <td colspan="3">
                 <c:if test="${s.organizeID == 1}"><span class="org-note">星范</span></c:if>
-                ${s.buyer}<c:if test="${s.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+                ${s.buyer}<c:if test="${s.organizeID == 3}"></c:if>
             </td>
             <td>
                         <c:if test="${s.freight == 0}">

src/main/webapp/WEB-INF/views/modules/order/refundRecord.jsp

@@ -191,7 +191,7 @@
                     <c:if test="${order.organizeID == '1'}">
                         <span class="org-note">星范</span>
                     </c:if>
-                        ${order.buyer}<c:if test="${order.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+                        ${order.buyer}<c:if test="${order.organizeID == 3}"></c:if>
                 </td>
                 <td><fmt:formatNumber value="${order.discountFee}" type="number" pattern="#,##0.00"/></td>
                 <td>

src/main/webapp/WEB-INF/views/modules/userNew/cmAgencyList.jsp

@@ -368,15 +368,15 @@
                     <c:when test="${newCmClubList.status eq 90}">
                         <font color="green">已上线</font>
                         <%--不存在组织的用户为采美用户，只有采美用户才有上线下线功能--%>
-                        <c:if test="${newCmClubList.userOrganizeID eq null or newCmClubList.userOrganizeID eq 0}">
+<%--                        <c:if test="${newCmClubList.userOrganizeID eq null or newCmClubList.userOrganizeID eq 0}">--%>
                             &nbsp;&nbsp;<a href="${ctx}/new/user/agency/offline?id=${newCmClubList.clubID}&searchName=${newCmClub.searchName}&searchUserName=${newCmClub.searchUserName}&searchBindMobile=${newCmClub.searchBindMobile}&searchEmail=${newCmClub.searchEmail}&searchUserOrganizeID=${newCmClub.searchUserOrganizeID}&searchStatus=${newCmClub.searchStatus}&searchUserIdentity=${newCmClub.searchUserIdentity}&searchStartTime=${newCmClub.searchStartTime}&searchEndTime=${newCmClub.searchEndTime}" onclick="return confirmx('确定下线该会所吗？', this.href)" style="text-decoration:underline;">下线</a>
-                        </c:if>
+<%--                        </c:if>--%>
                     </c:when>
                     <c:when test="${newCmClubList.status eq 91}">
                         <font color="red">已下线</font>
-                        <c:if test="${newCmClubList.userOrganizeID eq null or newCmClubList.userOrganizeID eq 0}">
+<%--                        <c:if test="${newCmClubList.userOrganizeID eq null or newCmClubList.userOrganizeID eq 0}">--%>
                             &nbsp;&nbsp;<a href="${ctx}/new/user/agency/online?id=${newCmClubList.clubID}&searchName=${newCmClub.searchName}&searchUserName=${newCmClub.searchUserName}&searchBindMobile=${newCmClub.searchBindMobile}&searchEmail=${newCmClub.searchEmail}&searchUserOrganizeID=${newCmClub.searchUserOrganizeID}&searchStatus=${newCmClub.searchStatus}&searchUserIdentity=${newCmClub.searchUserIdentity}&searchStartTime=${newCmClub.searchStartTime}&searchEndTime=${newCmClub.searchEndTime}" onclick="return confirmx('确定上线该会所吗？', this.href)" style="text-decoration:underline;">上线</a>
-                        </c:if>
+<%--                        </c:if>--%>
                     </c:when>
                     <c:when test="${newCmClubList.status eq 92}">
                         <a href="JavaScript:;" onclick="return alertx('不通过原因：${newCmClubList.auditNote}')"
@@ -424,9 +424,9 @@
                     </c:if>
                     <c:if test="${newCmClubList.status eq 90 || newCmClubList.status eq 40 || newCmClubList.status eq 1 || newCmClubList.status eq 92}">
                         <%--不存在组织的用户为采美用户，只有采美用户才以下功能--%>
-                        <c:if test="${newCmClubList.userOrganizeID eq null or newCmClubList.userOrganizeID eq 0 or newCmClubList.userOrganizeID eq 2}">
+<%--                        <c:if test="${newCmClubList.userOrganizeID eq null or newCmClubList.userOrganizeID eq 0 or newCmClubList.userOrganizeID eq 2}">--%>
                             <a href="javascript:void(0);" onclick="showSPSelect(${newCmClubList.clubID})">更换协销</a>
-                        </c:if>
+<%--                        </c:if>--%>
                         <a href="${ctx}/new/user/agency/operation?userOrganizeID=${newCmClubList.userOrganizeID}&clubID=${newCmClubList.clubID}&userID=${newCmClubList.userID}&name=${newCmClubList.name}">查看运营人员</a>
                     </c:if>
                     <c:if test="${newCmClubList.status eq 1 || newCmClubList.status eq 92}">

src/main/webapp/WEB-INF/views/modules/weisha/cmMallOrganizeList.jsp

@@ -117,7 +117,7 @@
 					<td>
 						<a href="${ctx}/weisha/cmMallOrganize/form?id=${cmUserOrganize.id}">编辑</a>
 						<a href="${ctx}/weisha/cmOrganizeBuyer?organizeId=${cmUserOrganize.id}">采购员</a>
-						<a href="${ctx}/weisha/user/organizeClubList?userOrganizeID=${cmUserOrganize.id}">机构列表</a>
+						<a href="${ctx}/weisha/cmOrganizeStore/list?organizeId=${cmUserOrganize.id}">门店列表</a>
 						<a href="${ctx}/weisha/cmOrganizeProduct/list?organizeId=${cmUserOrganize.id}">商品列表</a>
 						<a href="${ctx}/weisha/cmOrganizePromotions/list?organizeId=${cmUserOrganize.id}&type=1">促销活动</a>
 					</td>

src/main/webapp/WEB-INF/views/modules/weisha/cmOrganizeStoreForm.jsp

@@ -0,0 +1,214 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<html>
+<head>
+	<title>门店管理</title>
+	<meta name="decorator" content="default"/>
+	<script type="text/javascript">
+		$(document).ready(function() {
+			//$("#name").focus();
+			$("#inputForm").validate({
+				submitHandler: function(form){
+					loading('正在提交，请稍等...');
+					form.submit();
+				},
+				errorContainer: "#messageBox",
+				errorPlacement: function(error, element) {
+					$("#messageBox").text("输入有误，请先更正。");
+					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+						error.appendTo(element.parent().parent());
+					} else {
+						error.insertAfter(element);
+					}
+				}
+			});
+		});
+
+		/**
+		 * @param obj
+		 * jquery控制input只能输入数字
+		 */
+		function mobileVerification(obj) {
+			var reg = /^1\d{10}$/;
+			var contractMobile = document.getElementById("mobile").value;
+			if(!reg.test(contractMobile)){
+				alertx("请输入正确的手机号");
+				$("#contractMobile").val("");
+			}
+		}
+	</script>
+</head>
+<body>
+	<ul class="nav nav-tabs">
+		<li><a href="${ctx}/weisha/cmMallOrganize">组织列表</a></li>
+		<li><a href="${ctx}/weisha/cmOrganizeStore/list?organizeId=${cmOrganizeStore.organizeId}">门店列表</a></li>
+		<li class="active"><a href="${ctx}/weisha/cmOrganizeStore/form?organizeId=${cmOrganizeStore.organizeId}&id=${cmOrganizeStore.id}">${not empty cmOrganizeStore.id?'编辑':'上线'}门店</a></li>
+	</ul><br/>
+	<form:form id="inputForm" modelAttribute="cmOrganizeStore" action="${ctx}/weisha/cmOrganizeStore/save" method="post" class="form-horizontal">
+		<form:hidden path="id"/>
+		<form:hidden path="organizeId"/>
+		<input type="hidden" id="curProvince" name="curProvince" value="${cmOrganizeStore.provinceName}" disabled="disabled">
+		<input type="hidden" id="curCity" name="curCity" value="${cmOrganizeStore.cityName}" disabled="disabled">
+		<input type="hidden" id="curTown" name="curTown" value="${cmOrganizeStore.townName}" disabled="disabled">
+		<sys:message content="${message}"/>
+		<div class="control-group">
+			<label class="control-label">门店名称：</label>
+			<div class="controls">
+				<form:input path="name" htmlEscape="false" maxlength="30" class="input-xlarge "/>
+			</div>
+		</div>
+		<div class="control-group">
+			<label class="control-label">联系人：</label>
+			<div class="controls">
+				<form:input path="linkMan" htmlEscape="false" maxlength="15" class="input-xlarge "/>
+			</div>
+		</div>
+		<div class="control-group">
+			<label class="control-label">手机号：</label>
+			<div class="controls">
+				<form:input path="mobile" htmlEscape="false" maxlength="11" class="input-xlarge " onchange="mobileVerification(this)"/>
+			</div>
+		</div>
+		<div class="control-group">
+			<label class="control-label"><b><font color="red">*</font>地址：</b></label>
+			<div class="controls">
+				<form:select path="provinceId" class="input-xlarge required" id="province"
+							 onchange="loadCity()" style="width:100px;">
+					<form:option value="" label="省" provinceId=""/>
+				</form:select>
+				<form:select path="cityId" class="input-xlarge required" id="city" onchange="loadTown()"
+							 style="width:100px;">
+					<form:option value="" label="市" cityId=""/>
+				</form:select>
+				<form:select path="townId" class="input-xlarge required" id="town" style="width:100px;">
+					<form:option value="" label="区"/>
+				</form:select>
+				<form:input path="address" class="input-xlarge userAddress required" width="20px" maxlength="60" placeholder="请填写门店详细的地址" />
+			</div>
+		</div>
+		<div class="form-actions">
+			<input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;
+			<input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
+		</div>
+	</form:form>
+<script>
+	/**
+	 * 加载地址
+	 *
+	 * Created by LG on 2017/8/12.
+	 */
+	$(function() {
+		loadProvince();
+	});
+
+	/**
+	 * 加载省份
+	 * @param curProvince
+	 */
+	function loadProvince() {
+		var curProvince=$("#curProvince").val();
+		$.ajax({
+			type: 'POST',
+			dataType: 'json',
+			url: '/area/loadProvince',
+			success: function(data) {
+				$("#province").html("");
+				$("#province").append("<option value=''>省</option>");
+				for(var i=0; i<data.length; i++) {
+					if(curProvince != '' && curProvince != null && typeof(curProvince) != "undefined" && curProvince == data[i].name) {
+						$("#province").append("<option value='" + data[i].id + "' provinceId=" + data[i].id +" selected>" + data[i].name +"</option>");
+						$(".select2-chosen").eq(0).html(curProvince);
+						loadCity($("#curCity").val());
+					} else {
+						$("#province").append("<option value='" + data[i].id + "' provinceId=" + data[i].id +">" + data[i].name +"</option>");
+					}
+				}
+			}
+
+		});
+	}
+
+	/**
+	 * 加载城市
+	 */
+	function loadCity(curCity) {
+		var provinceId = $("#province option:selected").attr("provinceId");
+
+		$("#town").html("");
+		$(".select2-chosen").eq(2).html("区");
+		$("#town").append("<option value=''>区</option>");
+
+		if(typeof(provinceId) != "undefined") {
+			$.ajax({
+				type: 'POST',
+				dataType: 'json',
+				data: {'provinceId':provinceId},
+				url: '/area/loadCity',
+				success: function(data) {
+					$(".select2-chosen").eq(1).html("市");
+					$("#city").html("");
+					$("#city").append("<option value=''>市</option>");
+					for(var i=0; i<data.length; i++) {
+						if(curCity != null && typeof(curCity) != "undefined" && curCity == data[i].name) {
+							$("#city").append("<option value='" + data[i].id + "' selected cityId=" + data[i].id +">" + data[i].name +"</option>");
+							$(".select2-chosen").eq(1).html(curCity);
+							loadTown($("#curTown").val());
+						} else {
+							$("#city").append("<option value='" + data[i].id + "' cityId=" + data[i].id +">" + data[i].name +"</option>");
+						}
+
+
+					}
+				}
+
+			});
+		} else {
+			$("#city").html("");
+			$(".select2-chosen").eq(1).html("市");
+			$("#city").append("<option value=''>市</option>");
+
+			$("#town").html("");
+			$(".select2-chosen").eq(2).html("区");
+			$("#town").append("<option value=''>区</option>");
+		}
+	}
+
+	/**
+	 * 加载县区
+	 * @param curTown
+	 */
+	function loadTown(curTown) {
+		var cityId = $("#city option:selected").attr("cityId");
+		if(typeof(cityId) != "undefined") {
+			$.ajax({
+				type: 'POST',
+				dataType: 'json',
+				data: {'cityId':cityId},
+				url: '/area/loadTown',
+				success: function(data) {
+					$(".select2-chosen").eq(2).html("区");
+					$("#town").html("");
+					$("#town").append("<option value=''>区</option>");
+					for(var i=0; i<data.length; i++) {
+						if(curTown != null && typeof(curTown) != "undefined" && curTown == data[i].name) {
+							$("#town").append("<option value='" + data[i].id + "' selected>" + data[i].name +"</option>");
+							$(".select2-chosen").eq(2).html(curTown);
+						} else {
+							$("#town").append("<option value='" + data[i].id + "'>" + data[i].name +"</option>");
+						}
+
+
+					}
+				}
+
+			});
+		} else {
+			$("#town").html("");
+			$(".select2-chosen").eq(2).html("区");
+			$("#town").append("<option value=''>区</option>");
+		}
+	}
+
+</script>
+</body>
+</html>

src/main/webapp/WEB-INF/views/modules/weisha/cmOrganizeStoreList.jsp

@@ -0,0 +1,104 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<html>
+<head>
+	<title>门店管理</title>
+	<meta name="decorator" content="default"/>
+	<style type="text/css">
+		.table th{text-align: center;}
+		.table td{text-align: center;}
+	</style>
+	<script type="text/javascript">
+		$(document).ready(function() {
+			
+		});
+		function page(n,s){
+			$("#pageNo").val(n);
+			$("#pageSize").val(s);
+			$("#searchForm").submit();
+        	return false;
+        }
+	</script>
+</head>
+<body>
+	<ul class="nav nav-tabs">
+		<li><a href="${ctx}/weisha/cmMallOrganize">组织列表</a></li>
+		<li class="active"><a href="${ctx}/weisha/cmOrganizeStore?organizeId=${cmOrganizeStore.organizeId}">门店列表</a></li>
+	</ul>
+	<form:form id="searchForm" modelAttribute="cmOrganizeStore" action="${ctx}/weisha/cmOrganizeStore/" method="post" class="breadcrumb form-search">
+		<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+		<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+		<form:hidden path="organizeId"/>
+		<div class="ul-form">
+			 <label>门店名称：</label>
+				<form:input path="name" htmlEscape="false" maxlength="30" class="input-medium"/>
+			 <label>联系人：</label>
+				<form:input path="linkMan" htmlEscape="false" maxlength="15" class="input-medium"/>
+			 <label>手机号：</label>
+				<form:input path="mobile" htmlEscape="false" maxlength="11" class="input-medium"/>
+			 <label>上线状态：</label>
+			<form:select path="status" class="input-mini">
+				<form:option value="" label="请选择"/>
+				<form:option value="1" label="已上线"/>
+				<form:option value="2" label="已下线"/>
+			</form:select>
+			 <label>添加时间：</label>
+				<input name="startTime" type="text" readonly="readonly" maxlength="15" class="input-mini Wdate"
+					   value="${startTime}"
+					   onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/> -
+				<input name="endTime" type="text" readonly="readonly" maxlength="15" class="input-mini Wdate"
+					   value="${endTime}"
+					   onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
+			&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="搜索"/>
+			&nbsp;&nbsp;<input id="btnSubmit1" class="btn btn-primary" style="width: 64px" onclick="window.location='${ctx}/weisha/cmOrganizeStore/form?organizeId=${cmOrganizeStore.organizeId}'" value="上线门店"/>
+			<div class="clearfix"></div>
+		</div>
+	</form:form>
+	<sys:message content="${message}"/>
+	<font color="blue">当前组织：${organizeName}</font>
+	<table id="contentTable" class="table table-striped table-bordered table-condensed">
+		<thead>
+			<tr>
+				<th>门店名称</th>
+				<th>联系人</th>
+				<th>手机号</th>
+				<th>状态</th>
+				<th>添加时间</th>
+				<th>操作</th>
+			</tr>
+		</thead>
+		<tbody>
+		<c:forEach items="${page.list}" var="cmOrganizeStore">
+			<tr>
+				<td>
+					${cmOrganizeStore.name}
+				</td>
+				<td>
+					${cmOrganizeStore.linkMan}
+				</td>
+				<td>
+					${cmOrganizeStore.mobile}
+				</td>
+				<td>
+					<c:if test="${cmOrganizeStore.status eq 1}">
+						<font color="green">已上线</font>
+						<a href="${ctx}/weisha/cmOrganizeStore/save?id=${cmOrganizeStore.id}&status=2"   onclick="return confirmx('确定下线该门店吗？', this.href)">下线</a>
+					</c:if>
+					<c:if test="${cmOrganizeStore.status eq 2}">
+						<font color="red">已下线</font>
+						<a href="${ctx}/weisha/cmOrganizeStore/save?id=${cmOrganizeStore.id}&status=1" onclick="return confirmx('确定上线该门店吗？', this.href)" >上线</a>
+					</c:if>
+				</td>
+				<td>
+					<fmt:formatDate value="${cmOrganizeStore.addTime}" pattern="yyyy-MM-dd HH:mm:ss"/>
+				</td>
+				<td>
+    				<a href="${ctx}/weisha/cmOrganizeStore/form?id=${cmOrganizeStore.id}">编辑</a>
+				</td>
+			</tr>
+		</c:forEach>
+		</tbody>
+	</table>
+	<div class="pagination">${page}</div>
+</body>
+</html>