Merge branch 'pre' into 'master'

Pre

See merge request !152

liquidnet-bus-do/liquidnet-service-adam-do/src/main/resources/com/liquidnet/service/adam/mapper/AdamMemberOrderMapper.xml

@@ -50,10 +50,12 @@
                 and amo.source = #{source}
             </if>
             <if test="paymentAtStart != null  and paymentAtStart != ''">
-                and amo.payment_at &gt; #{paymentAtStart}
+#                 and amo.payment_at &gt; #{paymentAtStart}
+                and amo.payment_at <![CDATA[>=]]> #{paymentAtStart}
             </if>
             <if test="paymentAtEnd != null  and paymentAtEnd != ''">
-                and amo.payment_at &lt; #{paymentAtEnd}
+#                 and amo.payment_at &lt; #{paymentAtEnd}
+                and amo.payment_at <![CDATA[<=]]> #{paymentAtEnd}
             </if>
         </where>
         order by amo.created_at desc

liquidnet-bus-service/liquidnet-service-stone/liquidnet-service-stone-impl/src/main/java/com/liquidnet/service/stone/service/impl/StoneScoreLogsServiceImpl.java

@@ -88,15 +88,15 @@ public class StoneScoreLogsServiceImpl implements IStoneScoreLogsService {
             }
             Date userMonth = DateUtil.parse(vo.getCurrentMonth() == null ? DateUtil.getNowTime() : vo.getCurrentMonth(), "yyyy-MM");
             int monthScore = vo.getMonthScore() == null ? 0 : vo.getMonthScore();
-            if (DateUtil.compareMonth(userMonth, DateUtil.parse(DateUtil.getNowTime(), "yyyy-MM")) == 0) {//当月
-                if ((monthScore + score) >= monthMax) {
-                    score = monthMax - monthScore;
-                }
-            } else {
-                if (score >= monthMax) {
-                    score = monthMax;
-                }
-            }
+//            if (DateUtil.compareMonth(userMonth, DateUtil.parse(DateUtil.getNowTime(), "yyyy-MM")) == 0) {//当月
+//                if ((monthScore + score) >= monthMax) {
+//                    score = monthMax - monthScore;
+//                }
+//            } else {
+//                if (score >= monthMax) {
+//                    score = monthMax;
+//                }
+//            }
 //            Date userDay = DateUtil.parse(vo.getCurrentDay() == null ? DateUtil.getNowTime() : vo.getCurrentDay(), "yyyy-MM-dd");
 //            int dayScore = vo.getDayScore() == null ? 0 : vo.getDayScore();
 //            if (DateUtil.compareDay(userDay, DateUtil.parse(DateUtil.getNowTime(), "yyyy-MM-dd")) == 0) {//当日