注册ip所在地

src/main/java/com/caimei/modules/coupon/service/CmVipCouponService.java

@@ -47,6 +47,10 @@ public class CmVipCouponService extends CrudService<CmCouponVipDao, CmVipCoupon>
                 calendar.add(Calendar.MONTH,2);
                 Date time = calendar.getTime();
                 vipCoupon.setEndTime(simpleDateFormat.format(time));
+                Date newParse = simpleDateFormat.parse("2023-02");
+                if (parse.before(newParse)) {
+                    vipCoupon.setEndTime(vipCoupon.getUseTime());
+                }
             } catch (ParseException e) {
                 e.printStackTrace();
             }
@@ -76,6 +80,10 @@ public class CmVipCouponService extends CrudService<CmCouponVipDao, CmVipCoupon>
                 calendar.add(Calendar.MONTH,2);
                 Date time = calendar.getTime();
                 vipCoupon.setEndTime(simpleDateFormat.format(time));
+                Date newParse = simpleDateFormat.parse("2023-02");
+                if (parse.before(newParse)) {
+                    vipCoupon.setEndTime(vipCoupon.getUseTime());
+                }
             } catch (ParseException e) {
                 e.printStackTrace();
             }
@@ -108,6 +116,10 @@ public class CmVipCouponService extends CrudService<CmCouponVipDao, CmVipCoupon>
                     calendar.add(Calendar.MONTH,2);
                     Date time = calendar.getTime();
                     vipCoupon.setEndTime(simpleDateFormat.format(time));
+                    Date newParse = simpleDateFormat.parse("2023-02");
+                    if (parse.before(newParse)) {
+                        vipCoupon.setEndTime(vipCoupon.getUseTime());
+                    }
                 } catch (ParseException e) {
                     e.printStackTrace();
                 }

src/main/java/com/caimei/modules/user/service/ClubPortraitService.java

@@ -257,8 +257,23 @@ public class ClubPortraitService {
                     }
                     number = 0;
                 }
+                // 数组根据出现次数排序
+                int temp = 0;
+                String strTemp = "";
+                for (int i = 0; i < integers.size() - 1; i++) {
+                    for (int k = 0; k < integers.size() - 1 - i; k++) {
+                        if (integers.get(k) > integers.get(k+1)) {
+                            temp = integers.get(k);
+                            integers.set(k,integers.get(k+1));
+                            integers.set(k+1,temp);
 
-                cmPortrait.setRemarksTotal(remarksList.get(0).getNumbers());
+                            strTemp = strings.get(k);
+                            strings.set(k,strings.get(k+1));
+                            strings.set(k+1,strTemp);
+                        }
+                    }
+                }
+//                cmPortrait.setRemarksTotal(remarksList.get(0).getNumbers());
                 cmPortrait.setRemarksValue(integers);
                 cmPortrait.setRemarksType(strings);
             }

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

@@ -1219,10 +1219,12 @@ public class AgencyController extends BaseController {
         }else {
             linkage="http://localhost:8081/clubinfo.html?clubId="+clubId;
         }
-        // 机构注册IP
+        // 机构注册IP，注册ip所在地
         List<CmBehaviorRecord> behaviorList = newCmClubDao.selRegisterIP(clubId);
         CmBehaviorRecord record = new CmBehaviorRecord();
         record.setClubID(clubId);
+        // 注册ip所在地
+        String ipAddress = behaviorList.get(0).getRegion();
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         // 获取注册时间一周前时间
         Calendar calendar = Calendar.getInstance();
@@ -1262,6 +1264,7 @@ public class AgencyController extends BaseController {
         model.addAttribute("linkage",linkage);
         model.addAttribute("describe",describe);
         model.addAttribute("masBehavior",masBehavior);
+        model.addAttribute("ipAddress",ipAddress);
         model.addAttribute("clubId", clubId);
         return "modules/userNew/recordLinkageForm";
     }

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

@@ -716,6 +716,6 @@
         LIMIT 1
     </select>
     <select id="selRegisterIP" resultType="com.caimei.modules.user.entity.CmBehaviorRecord">
-        SELECT u.registerIP, u.registerTime FROM USER u LEFT JOIN club c ON u.userID = c.userID WHERE c.clubID = #{clubId}
+        SELECT u.registerIP,u.ipAddress AS region, u.registerTime FROM USER u LEFT JOIN club c ON u.userID = c.userID WHERE c.clubID = #{clubId}
     </select>
 </mapper>

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

@@ -125,12 +125,16 @@
 
 		<sys:message content="${message}"/>
 	<input type="hidden" id='clubId' name='clubId' value="${clubId}">
+		<div class="control-group">
+			<label class="control-label"><font color="red">*</font>注册地：</label>
+			<span>${ipAddress}</span>
+		</div>
 		<div class="control-group">
 			<label class="control-label"><font color="red">*</font>描述：</label>
             <textarea id='describe' <c:if test="${empty describe}">placeholder="请输入该用户的行为信息，例如查看了什么商品或者文章，以及任何需要销售人员注意的信息"</c:if>
 					  name='describe' rows='5' cols='12' style="width: 700px" maxlength="500"><c:if test="${not empty describe}">${describe}</c:if><c:if test="${masBehavior ne ''}">,${masBehavior}</c:if></textarea>
 			<textarea hidden id="masBehavior" path="masBehavior"  name="masBehavior" style="width: 700px; visibility: hidden" maxlength="200"><c:if test="${masBehavior ne ''}">,${masBehavior}</c:if></textarea>
-		</div><%--<c:if test="${masBehavior ne ''}">,${masBehavior}</c:if>--%>
+		</div>
 
 	<div class="control-label">链接：</div><span id='link' name='link'>${link}</span>
 		<div class="form-actions">