Merge remote-tracking branch 'origin/feature/dev_sunjiatan' into feature/dev_sunjiatan

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordDailyDTO.java

@@ -15,11 +15,11 @@ public class PointAditiveRecordDailyDTO implements Serializable {
     /**
      * 日期yyyy-MM-dd
      */
-    private String dateStr;
+    private String date;
     /**
      * 时间hh:mm
      */
-    private String timeStr;
+    private String time;
     /**
      * 标题
      */
@@ -27,11 +27,11 @@ public class PointAditiveRecordDailyDTO implements Serializable {
     /**
      * 积分说明
      */
-    private String statement;
+    private String remark;
     /**
      * 积分值
      */
-    private String pointValue;
+    private String point;
     /**
      * 业务主键
      */

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordResultDTO.java

@@ -16,6 +16,6 @@ public class PointAditiveRecordResultDTO implements Serializable {
     /**
      * 日期yyyy-MM-dd
      */
-    private String dateStr;
-    private List<PointAditiveRecordDailyDTO> recordList;
+    private String date;
+    private List<PointAditiveRecordDailyDTO> dailyList;
 }

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveRecordServiceImpl.java

@@ -126,15 +126,15 @@ public class PointAditiveRecordServiceImpl extends BaseServiceImpl<PointAditiveR
 
         if(CollectionUtils.isNotEmpty(recordList)){
             Map<String,List<PointAditiveRecordDailyDTO>> map =
-                    recordList.stream().collect(Collectors.groupingBy(PointAditiveRecordDailyDTO::getDateStr));
+                    recordList.stream().collect(Collectors.groupingBy(PointAditiveRecordDailyDTO::getDate));
 
             Map<String, List<PointAditiveRecordDailyDTO>> sortedMap = Maps.newLinkedHashMap();
             map.entrySet().stream().sorted(Map.Entry.<String, List<PointAditiveRecordDailyDTO>>comparingByKey().reversed())
                     .forEachOrdered(e -> sortedMap.put(e.getKey(), e.getValue()));
             sortedMap.forEach((key, value) -> {
                 PointAditiveRecordResultDTO o = new PointAditiveRecordResultDTO();
-                o.setDateStr(key);
-                o.setRecordList(value);
+                o.setDate(key);
+                o.setDailyList(value);
                 list.add(o);
             });
 

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java

@@ -71,12 +71,18 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl<UserPointTotalDao
      **/
     @Override
     public ResiPointDetailResultDTO getMyPoint(CommonUserFormDTO param) {
-        ResiPointDetailResultDTO result = baseDao.selectPointByCustomerUserId(param.getUserId(),param.getCustomerId());
-        if(null == result) {
-            return new ResiPointDetailResultDTO();
-        }
-        if(null == result.getUsablePoint() || null == result.getAccumulatedPoint()) {
-            return new ResiPointDetailResultDTO();
+        ResiPointDetailResultDTO activeTotal = baseDao.selectPointByCustomerUserId(param.getUserId(), param.getCustomerId());
+        ResiPointDetailResultDTO result = new ResiPointDetailResultDTO();
+        CommonPageUserFormDTO formDTO = new CommonPageUserFormDTO();
+        formDTO.setCustomerId(param.getCustomerId());
+        formDTO.setUserId(param.getUserId());
+        MyTotalPointResultDTO education = getEducationTotal(formDTO);
+        MyTotalPointResultDTO party = getPartyTotal(formDTO);
+        MyTotalPointResultDTO active = getActiveTotal(formDTO);
+        result.setAccumulatedPoint(education.getTotal() + party.getTotal() + active.getTotal());
+        result.setUsablePoint(education.getUsable() + party.getUsable() + active.getUsable());
+        if (null != activeTotal) {
+            result.setTodayObtainedPoint(activeTotal.getTodayObtainedPoint());
         }
         return result;
     }

epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveRecordDao.xml

@@ -23,16 +23,16 @@
     <select id="selectRecordList" resultType="com.epmet.dto.result.PointAditiveRecordDailyDTO">
         SELECT
             TITLE,
-            STATEMENT,
+            STATEMENT AS remark,
             CASE
                 POINT_VALUE
                 WHEN POINT_VALUE > 0 THEN
                 concat( '+', POINT_VALUE ) ELSE POINT_VALUE
-            END AS POINT_VALUE,
+            END AS point,
             BUSINESS_ID,
             BUSINESS_CODE,
-            DATE_FORMAT( CREATED_TIME, '%Y-%m-%d' ) AS dateStr,
-            DATE_FORMAT( CREATED_TIME, '%H:%i' ) AS timeStr
+            DATE_FORMAT( CREATED_TIME, '%Y-%m-%d' ) AS date,
+            DATE_FORMAT( CREATED_TIME, '%H:%i' ) AS time
         FROM
             point_aditive_record
         WHERE