Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage

src/main/java/au/com/royalpay/payment/manage/activities/monsettledelay/core/impls/ActMonDelaySettleServiceImp.java

@@ -17,11 +17,9 @@ import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
 
@@ -65,7 +63,7 @@ public class ActMonDelaySettleServiceImp implements ActMonDelaySettleService {
         List<JSONObject> clientLogs = actMonDelaySettleMapper.clientLog(client_id);
         JSONObject res = new JSONObject();
         Boolean apply = false;
-        if (!clientLogs.isEmpty() && clientLogs.size() > 0) {
+        if (!clientLogs.isEmpty()) {
             apply = true;
         }
         if (new Date().compareTo(act.getDate("active_date")) < 0) {
@@ -90,7 +88,7 @@ public class ActMonDelaySettleServiceImp implements ActMonDelaySettleService {
     @Override
     public void actApply(JSONObject device) {
         JSONObject act = actAppMapper.getActDetail("1");
-        Assert.notNull(act,"The activity is not valid");
+        Assert.notNull(act, "The activity is not valid");
         if (!act.getBoolean("is_valid")) {
             throw new BadRequestException("The activity is not valid");
         }
@@ -104,7 +102,7 @@ public class ActMonDelaySettleServiceImp implements ActMonDelaySettleService {
         deviceSupport.findRegister(clientType);
         int client_id = device.getIntValue("client_id");
         List<JSONObject> clientLogs = actMonDelaySettleMapper.clientLog(client_id);
-        if (!clientLogs.isEmpty() && clientLogs.size() > 0) {
+        if (!clientLogs.isEmpty()) {
             throw new BadRequestException("您已经参与过活动，无需重复报名");
         }
         JSONObject account = clientAccountMapper.findById(device.getString("account_id"));
@@ -125,7 +123,7 @@ public class ActMonDelaySettleServiceImp implements ActMonDelaySettleService {
         deviceSupport.findRegister(clientType);
         int client_id = device.getIntValue("client_id");
         List<JSONObject> clientLogs = actMonDelaySettleMapper.clientLog(client_id);
-        if (clientLogs.isEmpty() || clientLogs.size() == 0) {
+        if (clientLogs.isEmpty()) {
             throw new BadRequestException("您未参加活动,不可取消");
         }
         JSONObject clientLog = clientLogs.get(0);

src/main/java/au/com/royalpay/payment/manage/merchants/beans/PartnerQuery.java

@@ -121,7 +121,7 @@ public class PartnerQuery {
         if (org_ids != null) {
             param.put("org_ids", org_ids);
         }
-        if (bd != null) {
+        if (StringUtils.isNotBlank(bd)) {
             param.put("bd_user", bd);
         }
         if (quickPass){

src/main/resources/au/com/royalpay/payment/manage/mappers/act/ActMonDelaySettleMapper.xml

@@ -4,7 +4,7 @@
     <select id="listAttendClients" resultType="com.alibaba.fastjson.JSONObject">
         select act.account_name,act.create_time,act.client_id,c.client_moniker
         FROM act_mon_delay_settle act
-        LEFT JOIN sys_clients c ON act.client_id = c.client_id
+        INNER JOIN sys_clients c ON act.client_id = c.client_id
         <where>
             act.is_valid = 1 and  c.is_valid = 1
             <if test="client_moniker!=null">and c.client_moniker = #{client_moniker}</if>

src/main/resources/templates/activity/mondelay/mondelay.html

@@ -47,20 +47,17 @@
         <li>本活动最终解释权归RoyalPay所有</li>
     </ul>
 </div>
-<div class="button_center" th:unless="${active}">
+<div class="button_center" th:if="${!active && !expire}">
     <button class="button_position button_active">
         <span style="color:#9BFBFE;"><font th:text="${#dates.format(active_date, 'MM-dd')}"></font> 敬请期待</span>
     </button>
 </div>
-<div th:if="${active}">
+    <div class="button_center" th:if="${active && !apply}" id="applyButton">
-    <div th:unless="${expire}">
+        <button class="button_position">
-        <div class="button_center" th:if="!${apply}" id="applyButton">
+            <span style="color: #FFFFFF;">我要参加</span>
-            <button class="button_position">
+        </button>
-                <span style="color: #FFFFFF;">我要参加</span>
-            </button>
-        </div>
     </div>
-    <div th:class="${apply}?'margin_top'" th:if="${list.size()>0}">
+    <div th:class="${apply}?'margin_top'" th:if="${list!=null}">
         <div class="content">
             <div class="h3_width">
                 <h2>补贴金额记录</h2>
@@ -89,23 +86,26 @@
             </div>
         </div>
     </div>
-    <div th:unless="${expire}">
+    <div class="button_center cancel_posttion"  th:if="${active && apply}" id="cancelButton">
-        <div class="button_center cancel_posttion"  th:if="${apply}" id="cancelButton">
+        <button class="button_position button_color">
-            <button class="button_position button_color">
+            <span class="cancel">放弃活动资格</span>
-                <span class="cancel">取消</span>
+        </button>
-            </button>
-        </div>
     </div>
-</div>
+
 
 <div class="shape1_position"><img src="/static/templates/activity/mondelay/shape1@2x.png"></div>
 <div class="shape2_position"><img src="/static/templates/activity/mondelay/shape2@2x.png"></div>
 <div class="shape3_position"><img src="/static/templates/activity/mondelay/shape3@2x.png"></div>
 <div class="shape4_position"><img src="/static/templates/activity/mondelay/shape4@2x.png"></div>
 <div class="shape5_position"><img src="/static/templates/activity/mondelay/shape5@2x.png"></div>
-<footer class="royal_position"><img src="/static/templates/activity/mondelay/logo copy@2x.png">
+<div th:class="${list==null&&expire }?'margin_top_80'">
-    <div  class="shape6_position"><img src="/static/templates/activity/mondelay/shape6@2x.png"></div>
+    <div th:class="${list==null ||(active && apply) }?'margin_top_0'">
-</footer>
+        <footer class="royal_position"><img src="/static/templates/activity/mondelay/logo copy@2x.png">
+            <div th:if="${list!=null}" class="shape6_position"><img src="/static/templates/activity/mondelay/shape6@2x.png"></div>
+        </footer>
+    </div>
+</div>
+
 </body>
 </html>
 <script type="text/javascript" data-th-inline="javascript">

src/main/ui/static/config/notice/notice.js

@@ -175,7 +175,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
                     }
                 }
             }).result.then(function () {
-                commonDialog.alert({title: '操作成功', content: '您成功修改了密码', type: 'success'})
+                commonDialog.alert({title: '操作成功', content: '您成功发送了消息', type: 'success'})
             })
         };
     }]);

src/main/ui/static/templates/activity/mondelay/mondelay.css

@@ -83,6 +83,13 @@ h2{
     background: url("button@2x.png") no-repeat center;
     border-radius: 100px;
     padding: 15px 30px;
+    margin-bottom: 25px;
+}
+.margin_top_0{
+    margin-top: -30px;
+}
+.margin_top_80{
+    margin-top: 90px;
 }
 .button_active span{
     font-family: Avenir-Medium;
@@ -92,11 +99,11 @@ h2{
 .button_color{
     background-image: linear-gradient(0deg, #195ED0 0%, #4BBCF3 100%);
     border-radius: 100px;
-    margin-bottom: -16px;
+    padding: 10px 5px
 }
 .cancel{
     color: #FFFFFF;
-    padding: 13px 24px;
+    padding: 20px 20px;
 }
 .content_table{
     font-family: PingFang-SC-Semibold;
@@ -120,7 +127,7 @@ tbody tr:nth-child(odd){
     opacity: 0.7;
 }
 .royal_position{
-    margin-top: 50px;
+    margin-top: 30px;
     margin-bottom: 20px;
     text-align: center;
     position: relative;