bug fix

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

@@ -92,6 +92,7 @@ public class CmMallOrganizeController extends BaseController {
         }
         //判断该会所手机号是否已存在
         cmUser.setBindMobile(cmMallOrganize.getMobile());
+        newCmClub.setCheckTime(null);
         List<CmUser> listBuyBindMobile = cmUserService.findListBuyBindMobile(cmUser);
         if (CollectionUtils.isNotEmpty(listBuyBindMobile) && listBuyBindMobile.size() > 0) {
             addMessage(model, "手机号重复，请更换手机号");
@@ -104,14 +105,13 @@ public class CmMallOrganizeController extends BaseController {
         cmUser.setName(cmMallOrganize.getOrganizeName());
         cmUser.setLinkMan(cmMallOrganize.getOrganizeLinkName());
         cmUser.setUserName(cmMallOrganize.getOrganizeLinkName());
-        cmUser.setClubStatus("1".equals(cmMallOrganize.getStatus()) ? "90" : "91");
         newCmClub.setName(cmMallOrganize.getOrganizeName());
         newCmClub.setLinkMan(cmMallOrganize.getOrganizeLinkName());
         newCmClub.setContractMobile(cmMallOrganize.getMobile());
-        newCmClub.setStatus("1".equals(cmMallOrganize.getStatus()) ? 90 : 91);
         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");//设置默认协销状态
@@ -134,6 +134,7 @@ public class CmMallOrganizeController extends BaseController {
             }
             //添加会所表信息
             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);
@@ -169,12 +170,6 @@ public class CmMallOrganizeController extends BaseController {
     @RequestMapping(value = "onlineAndOffline")
     public String onlineAndOffline(Integer organizeId, String status) {
         cmMallOrganizeService.onlineAndOffline(organizeId, status);
-        CmUser cmUser = cmUserDao.findUserByOrganizeId(organizeId);
-        NewCmClub newCmClub = newCmClubService.getclubByUserId(cmUser.getUserID());
-        cmUser.setClubStatus("1".equals(status) ? "90" : "91");
-        newCmClub.setStatus("1".equals(status) ? 90 : 91);
-        cmUserService.update(cmUser);//更新用户表数据(编辑数据，或新增数据更新)
-        newCmClubService.update(newCmClub);//更新会所表数据(编辑数据，或新增数据更新)
         return "redirect:" + Global.getAdminPath() + "/weisha/cmMallOrganize/?repage";
     }
 

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

@@ -180,6 +180,7 @@
 			<if test="userIdentity != null and userIdentity != ''">
 				AND u.userIdentity = #{userIdentity}
 			</if>
+			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

@@ -70,6 +70,7 @@
 				ORDER BY ${page.orderBy}
 			</when>
 			<otherwise>
+				order by a.addTime desc
 			</otherwise>
 		</choose>
 	</select>

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

@@ -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>