修改订单

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

@@ -85,13 +85,13 @@ public class CmMallOrganizeController extends BaseController {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String currentDate = sdf.format(new Date());
         CmUser cmUser = new CmUser();
-        NewCmClub newCmClub = new NewCmClub();
+//        NewCmClub newCmClub = new NewCmClub();
         if (StringUtils.isNotEmpty(cmMallOrganize.getId())) {
             cmUser = cmUserDao.findUserByOrganizeId(Integer.parseInt(cmMallOrganize.getId()));
-            if(cmUser!=null){
+            /*if(cmUser!=null){
                 //获取会所资料信息
                 newCmClub = newCmClubService.getclubByUserId(cmUser.getUserID());
-            }
+            }*/
         }
         //判断该会所手机号是否已存在
         cmUser.setBindMobile(cmMallOrganize.getMobile());
@@ -101,7 +101,7 @@ public class CmMallOrganizeController extends BaseController {
             return form(cmMallOrganize, model);
         }
         cmMallOrganizeService.save(cmMallOrganize);
-        if (cmUser != null&&newCmClub!=null) {
+        /*if (cmUser != null&&newCmClub!=null) {
             //添加用户信息（新增或修改通用）
             cmUser.setUserOrganizeID(Integer.parseInt(cmMallOrganize.getId()));
             cmUser.setName(cmMallOrganize.getOrganizeName());
@@ -155,7 +155,7 @@ public class CmMallOrganizeController extends BaseController {
 
                 newCmClubService.update(newCmClub);//更新会所表数据(编辑数据，或新增数据更新)
             }
-        }
+        }*/
 
         addMessage(redirectAttributes, "保存组织成功");
         return "redirect:" + Global.getAdminPath() + "/weisha/cmMallOrganize/?repage";
@@ -167,4 +167,4 @@ public class CmMallOrganizeController extends BaseController {
         return "redirect:" + Global.getAdminPath() + "/weisha/cmMallOrganize/?repage";
     }
 
-}
+}

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

@@ -104,7 +104,7 @@
         LEFT JOIN (SELECT userID, activeState, customerValue FROM cm_organ_value_system WHERE stage = 0 AND delType = 1)
         covs ON a.userID = covs.userID
         <where>
-            (u.userOrganizeID IN(0,1) or u.clubStatus != 92)
+            (u.userOrganizeID IN(0,1) or u.clubStatus != 92) and u.userOrganizeID != 4
             <if test="clubID != null and clubID != ''">
                 AND a.clubID = #{clubID}
             </if>
@@ -863,6 +863,7 @@
         SELECT userID, MAX(orderTime) AS lastOrderTime FROM cm_order GROUP BY userID
         ) AS ordr ON c.userID = ordr.userID
         <where>
+             u.userOrganizeID != 4
             <if test="registerStartTime != null and registerStartTime != ''">
                 AND (c.addTime > #{registerStartTime} or c.addTime = #{registerStartTime} )
             </if>

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

@@ -886,6 +886,7 @@
                     <c:if test="${order.organizeID == 4&& voucherVo ne null }">
                         <font color="red">(联合丽格线下收款)</font>
                     </c:if>
+                </c:if>
             </span>
             <span>待付金额：<fmt:formatNumber value="${shopOrder.restAmount}" type="currency"/></span>
             <br/>

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

@@ -34,7 +34,7 @@
                onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
 
         &nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
-        &nbsp;&nbsp;<input class="btn btn-primary" style="width: 80px" onclick="window.location='${ctx}/weisha/cmMallUser/mallUserForm?organizeId=${cmMallOrganize.id}'" value="添加"/>
+<%--        &nbsp;&nbsp;<input class="btn btn-primary" style="width: 80px" onclick="window.location='${ctx}/weisha/cmMallUser/mallUserForm?organizeId=${cmMallOrganize.id}'" value="添加"/>--%>
         <div class="clearfix"></div>
     </div>
 </form:form>