机构画像调整

src/main/java/com/caimei/modules/user/entity/CmPortrait.java

@@ -30,6 +30,8 @@ public class CmPortrait extends DataEntity<CmPortrait> {
 
     // 订单总量
     private Integer orderTotal;
+    // 当前范围订单总金额
+    private double orderScopeTotalFee;
     // 当前订单范围总量
     private Integer orderScopeNum;
     // 订单总金额
@@ -121,6 +123,14 @@ public class CmPortrait extends DataEntity<CmPortrait> {
         this.orderTotal = orderTotal;
     }
 
+    public double getOrderScopeTotalFee() {
+        return orderScopeTotalFee;
+    }
+
+    public void setOrderScopeTotalFee(double orderScopeTotalFee) {
+        this.orderScopeTotalFee = orderScopeTotalFee;
+    }
+
     public Integer getOrderScopeNum() {
         return orderScopeNum;
     }

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

@@ -72,7 +72,7 @@ public class ClubPortraitService {
             String format = dateFormat.format(date);
             cmPortrait.setEndTime(endTime);
             // 日期参数为    日
-            if (0 ==  cmPortrait.getDateType() || 1 == cmPortrait.getDateType()) {
+            if (1 ==  cmPortrait.getDateType() || 1 == cmPortrait.getDateType()) {
                 cmPortrait.setAccessDate(endTime);
                 cmPortrait.setStartTime(endTime);
 //                cmPortrait.setEndTime(endTime);
@@ -114,7 +114,7 @@ public class ClubPortraitService {
                 cmPortrait.setEndTime(dateFormat.format(date));
             }
             int ordinary = 0, secondHand = 0, rebate = 0, partialRefund = 0, fullRefund = 0, closed = 0,total = 0;
-
+            double orderScopeTotalFee = 0.0;
             ArrayList<OrderPortrait> orderPortraits = new ArrayList<>();
             OrderPortrait orderPortrait = new OrderPortrait();
             List<NewOrder> orderList = cmPortraitDao.selOrderList(cmPortrait);
@@ -152,11 +152,13 @@ public class ClubPortraitService {
                     if ("6".equals(order.getStatus()) || StringUtils.isEmpty(order.getStatus())) {
                         closed++;
                     }
+                    orderScopeTotalFee += order.getPayTotalFee();
                 }
                 /*cmPortrait.setOrderTotalAmount(orderList.get(0).getTotalMoney());
                 cmPortrait.setOrderTotal(orderList.get(0).getNumbers());*/
                 cmPortrait.setOrderTotal(length);
-
+                // 当前单位订单总额
+                cmPortrait.setOrderScopeTotalFee(Double.valueOf(String.format("%.2f", orderScopeTotalFee)));
                 orderPortrait.setValue(ordinary);
                 if (ordinary != 0) {
                     orderPortrait.setName("普通订单 【" + instance.format((float)ordinary / (float) length * 100) + "%】 【" + ordinary + "个】");
@@ -248,7 +250,7 @@ public class ClubPortraitService {
                 cmPortrait.setEndTime(dateFormat.format(date));
             }
             List<CmClubRemarks> remarksList = cmPortraitDao.selRemarksList(cmPortrait);
-            int remarksTotal = 0;
+//            int remarksTotal = 0;
             ArrayList<Integer> integers = new ArrayList<>();
             ArrayList<String> strings = new ArrayList<>();
             ArrayList<String> strRemark = new ArrayList<>();
@@ -271,7 +273,7 @@ public class ClubPortraitService {
                         }
                     }
                     integers.add(number);
-                    remarksTotal += number;
+//                    remarksTotal += number;
                     if (!ObjectUtils.isEmpty(str)) {
                         strings.add(str);
                     } else {
@@ -299,7 +301,7 @@ public class ClubPortraitService {
                 cmPortrait.setRemarksValue(integers);
                 cmPortrait.setRemarksType(strings);
             }
-            cmPortrait.setRemarksScopeNum(remarksTotal);
+            cmPortrait.setRemarksScopeNum(remarksList.size());
             calendar.setTime(date);
             calendar.add(Calendar.DAY_OF_MONTH, -1);
             time = calendar.getTime();

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

@@ -50,7 +50,7 @@
                secondHandOrderFlag,
                rebateFlag,
                refundType,
-               productTotalFee,
+               payTotalFee,
                STATUS,
                orderTime
         FROM cm_order

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

@@ -739,8 +739,8 @@
     </delete>
 
     <insert id="addRecordLinkage">
-        INSERT INTO `record_link`(`describe`, `link`, clubId)
-        VALUES (#{describe}, #{link}, #{clubId})
+        INSERT INTO `record_link`(`describe`, `link`, clubId, addTime)
+        VALUES (#{describe}, #{link}, #{clubId}, now())
     </insert>
 
     <select id="recordLinkage" resultType="string">

src/main/webapp/static/modules/cmClubPortrait/cmClubEacths.js

@@ -213,7 +213,7 @@ const  setOrderData = function (type,data) {
                 $('#orderTimeEnd').val(data.order.endTime);
                 $('#orderTimeStart').val(data.order.startTime);
                 $('#orderTotalNum').text(`${data.order.orderTotalNum}个`);
-                $('#orderScopeNum').text(`${data.portrait.orderScopeNum}(个)`);
+                $('#orderScopeNum').text(`￥${data.portrait.orderScopeTotalFee}  ${data.portrait.orderScopeNum}(个)`);
             },
             id:'orderEacths',
             series:{