Browse Source

机构画像

huangzhiguo 2 years ago
parent
commit
664bfe024a

+ 12 - 9
src/main/java/com/caimei/modules/user/service/ClubPortraitService.java

@@ -55,12 +55,15 @@ public class ClubPortraitService {
             Date time = calendar.getTime();
             String endTime = dateFormat.format(time);
             String format = dateFormat.format(date);
+            cmPortrait.setEndTime(endTime);
             // 日期参数为    日
             if (0 ==  cmPortrait.getDateType() || 1 == cmPortrait.getDateType()) {
                 cmPortrait.setAccessDate(endTime);
+                cmPortrait.setStartTime(endTime);
+//                cmPortrait.setEndTime(endTime);
             }
             if (2 == cmPortrait.getDateType()) {
-                cmPortrait.setEndTime(endTime);
+//                cmPortrait.setEndTime(endTime);
                 calendar.setTime(time);
                 calendar.add(Calendar.MONTH, -1);
                 start = calendar.getTime();
@@ -68,7 +71,7 @@ public class ClubPortraitService {
                 cmPortrait.setStartTime(startTime);
             }
             if (3 == cmPortrait.getDateType()) {
-                cmPortrait.setEndTime(endTime);
+//                cmPortrait.setEndTime(endTime);
                 calendar.setTime(time);
                 calendar.add(Calendar.MONTH, -6);
                 start = calendar.getTime();
@@ -76,7 +79,7 @@ public class ClubPortraitService {
                 cmPortrait.setStartTime(startTime);
             }
             if (4 == cmPortrait.getDateType()) {
-                cmPortrait.setEndTime(endTime);
+//                cmPortrait.setEndTime(endTime);
                 calendar.setTime(time);
                 calendar.add(Calendar.YEAR, -1);
                 start = calendar.getTime();
@@ -137,7 +140,7 @@ public class ClubPortraitService {
                 if (ordinary != 0) {
                     orderPortrait.setName("普通订单 【" + instance.format((float)ordinary / (float) length * 100) + "%】 【" + ordinary + "个】");
                 } else {
-                    orderPortrait.setName("普通订单 【 0 】 【" + ordinary + "个】");
+                    orderPortrait.setName("普通订单 【 0 %】 【" + ordinary + "个】");
                 }
                 orderPortraits.add(orderPortrait);
                 orderPortrait = new OrderPortrait();
@@ -145,7 +148,7 @@ public class ClubPortraitService {
                 if (secondHand != 0) {
                     orderPortrait.setName("二手订单 【" + instance.format((float)secondHand / (float) length * 100) + "%】 【" + secondHand + "个】");
                 } else {
-                    orderPortrait.setName("二手订单 【 0 】 【" + secondHand + "个】");
+                    orderPortrait.setName("二手订单 【 0 %】 【" + secondHand + "个】");
                 }
                 orderPortraits.add(orderPortrait);
                 orderPortrait = new OrderPortrait();
@@ -153,7 +156,7 @@ public class ClubPortraitService {
                 if (rebate != 0) {
                     orderPortrait.setName("返佣订单 【" + instance.format((float)rebate / (float) length * 100) + "%】 【" + rebate + "个】");
                 } else {
-                    orderPortrait.setName("返佣订单 【 0 】 【" + rebate + "个】");
+                    orderPortrait.setName("返佣订单 【 0 %】 【" + rebate + "个】");
                 }
                 orderPortraits.add(orderPortrait);
                 orderPortrait = new OrderPortrait();
@@ -161,7 +164,7 @@ public class ClubPortraitService {
                 if (partialRefund != 0) {
                     orderPortrait.setName("部分退款订单 【" + instance.format((float)partialRefund / (float) length * 100) + "%】 【" + partialRefund + "个】");
                 } else {
-                    orderPortrait.setName("部分退款订单 【 0 】 【" + partialRefund + "个】");
+                    orderPortrait.setName("部分退款订单 【 0 %】 【" + partialRefund + "个】");
                 }
                 orderPortraits.add(orderPortrait);
                 orderPortrait = new OrderPortrait();
@@ -169,7 +172,7 @@ public class ClubPortraitService {
                 if (fullRefund != 0) {
                     orderPortrait.setName("全部退款订单 【" + instance.format((float)fullRefund / (float) length * 100) + "%】 【" + fullRefund + "个】");
                 } else {
-                    orderPortrait.setName("全部退款订单 【 0 】 【" + fullRefund + "个】");
+                    orderPortrait.setName("全部退款订单 【 0 %】 【" + fullRefund + "个】");
                 }
                 orderPortraits.add(orderPortrait);
                 orderPortrait = new OrderPortrait();
@@ -177,7 +180,7 @@ public class ClubPortraitService {
                 if (closed != 0) {
                     orderPortrait.setName("已关闭订单 【" + instance.format((float)closed / (float) length * 100) + "%】 【" + closed + "个】");
                 } else {
-                    orderPortrait.setName("已关闭订单 【 0 】 【" + closed + "个】");
+                    orderPortrait.setName("已关闭订单 【 0 %】 【" + closed + "个】");
                 }
                 orderPortraits.add(orderPortrait);
 

+ 6 - 5
src/main/webapp/WEB-INF/views/modules/userNew/cmClubData.jsp

@@ -213,9 +213,6 @@
     </table>
 </div>
 
-<input type="hidden" id="curProvince" name="curProvince" value="${newCmClub.province }" disabled="disabled">
-<input type="hidden" id="curCity" name="curCity" value="${newCmClub.city }" disabled="disabled">
-<input type="hidden" id="curTown" name="curTown" value="${newCmClub.town }" disabled="disabled">
 <sys:message content="${message}"/>
 <hr class="detailLine">
 <div>
@@ -224,7 +221,11 @@
             <td colspan="2">
                 <div class="control-group">
                     <label class="control-label"><b>地址:</b></label>
-                    <div class="controls">
+                    <span  id="curProvince" name="curProvince" >${newCmClub.province }</span>
+                    <span  id="curCity" name="curCity" >${newCmClub.province }</span>
+                    <span  id="curTown" name="curTown" >${newCmClub.town }</span>
+                        ${newCmClub.address}
+                    <%--<div class="controls">
                         <form:select path="provinceID" disabled="true" class="input-xlarge" id="province"
                                      onchange="loadCity()" style="width:100px;">
                             <form:option value="" label="省" provinceId=""/>
@@ -237,7 +238,7 @@
                             <form:option value="" label="区"/>
                         </form:select>
                             ${newCmClub.address}
-                    </div>
+                    </div>--%>
                 </div>
             </td>
         </tr>