Merge remote-tracking branch 'origin/gaohu-smile-0915-three' into gaohu-smile-0915-three

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/smileTickets/list.html

@@ -169,7 +169,7 @@
                         actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="toPop(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>设置票提</a> ');
                         // actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="editPop(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>编辑票提</a> ');
                         actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="toDetail(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>查看</a> ');
-                        actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>销售数据</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.performancesId + '\', 1200)"><i class="fa fa-edit"></i>销售数据</a> ');
                         return actions.join('');
                     }
                 }]

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/smileTickets/saleData.html

@@ -27,7 +27,7 @@
                     <td>票种名称</td>
                     <td>总代票提</td>
                     <td>普代票提</td>
-                <tr/>
+                </tr>
                 <div th:each="item : *{showAgentVoList}">
                     <tr class="content-tr">
                         <td th:text="${item.title}">
@@ -58,10 +58,12 @@
                     <td>总销售金额</td>
                     <td>总销售佣金</td>
                     <td>打款状态</td>
+                    <td>是否黑名单</td>
                     <td>操作</td>
-                <tr/>
+                </tr>
                 <div th:each="item : *{userDataList}">
                     <tr class="content-tr">
+                        <td th:text="${item}"></td>
                         <td th:text="${item.username}"></td>
                         <td th:text="${item.cityName}"></td>
                         <!--                        <td th:name="uid" th:text="${item.uid}" hidden="hidden"></td>-->
@@ -78,6 +80,8 @@
                         <td th:text="${item.totalCommission}"></td>
                         <td th:if="${item.priceStatus!=0}" th:text="待打款"></td>
                         <td th:if="${item.priceStatus==0}" th:text="已打款"></td>
+                        <td th:if="${item.state==0}" th:text="否"></td>
+                        <td th:if="${item.state==1}" th:text="是"></td>
                         <td th:if="${item.priceStatus!=0}">
                             <button type="button" class="btn btn-success btn-xs"
                                     th:onclick="submitHandler([[${item.uid}]])">
@@ -98,7 +102,7 @@
     $("#form-transfer-edit").validate({
         focusCleanup: true
     });
-
+    console.log('[[${saleDataVo}]]', '????')
 
     function submitHandler(uid) {
         var param = {

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetAppletSubMsgServiceImpl.java

@@ -21,6 +21,7 @@ import com.liquidnet.service.sweet.utils.QueueUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
@@ -45,6 +46,7 @@ public class SweetAppletSubMsgServiceImpl extends ServiceImpl<SweetAppletSubMsgM
     private SweetAppletSubMsgMapper subMsgMapper;
 
     @Autowired
+    @Lazy
     private FeignKylinPerformancesClient feignKylinPerformancesClient;
 
     @Autowired

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetIntegralActivityDrawServiceImpl.java

@@ -26,6 +26,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.bson.Document;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
@@ -62,10 +63,13 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
     private QueueUtils queueUtils;
 
     @Autowired
+    @Lazy
     private FeignStoneIntegralClient feignStoneIntegralClient;
     @Autowired
+    @Lazy
     private FeignAdamBaseClient feignAdamBaseClient;
     @Autowired
+    @Lazy
     private FeignCandyBaseClient feignCandyBaseClient;
 
     @Override

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetWechatLoginServiceImpl.java

@@ -24,6 +24,7 @@ import me.chanjar.weixin.common.bean.WxOAuth2UserInfo;
 import me.chanjar.weixin.common.bean.oauth2.WxOAuth2AccessToken;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -54,6 +55,7 @@ public class SweetWechatLoginServiceImpl {
     private WechatUsersRedisUtils redisUtils;
 
     @Autowired
+    @Lazy
     private FeignAdamBaseClient feignAdamBaseClient;
 
     public ResponseDto userInfo(String code, String encryptedData, String iv, Integer type) {

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetWechatTemplateServiceImpl.java

@@ -26,6 +26,7 @@ import me.chanjar.weixin.mp.bean.template.WxMpTemplateData;
 import me.chanjar.weixin.mp.bean.template.WxMpTemplateMessage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
@@ -63,6 +64,7 @@ public class SweetWechatTemplateServiceImpl {
     @Autowired
     private SweetRemindMapper sweetRemindMapper;
     @Autowired
+    @Lazy
     private FeignKylinPerformancesClient feignKylinPerformancesClient;
 
     @Autowired

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetWechatUsersServiceImpl.java

@@ -11,6 +11,7 @@ import com.liquidnet.service.sweet.vo.SweetAppletUsersVo;
 import com.liquidnet.service.sweet.vo.SweetWechatUsersVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
@@ -28,6 +29,7 @@ import java.util.HashMap;
 public class SweetWechatUsersServiceImpl extends ServiceImpl<SweetWechatUsersMapper, SweetWechatUsers> implements ISweetWechatUsersService {
 
     @Autowired
+    @Lazy
     private FeignStoneIntegralClient feignStoneIntegralClient;
 
     @Autowired

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisDataUtils.java

@@ -22,6 +22,7 @@ import com.liquidnet.service.sweet.param.SweetCityVoteParam;
 import com.liquidnet.service.sweet.vo.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
@@ -52,6 +53,7 @@ public class RedisDataUtils {
     @Autowired
     private SweetArtistsMapper sweetArtistsMapper;
     @Autowired
+    @Lazy
     private FeignSlimeApiClient feignSlimeApiClient;
 
     public List<SweetManualAppletDto> setPushList() {

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisFiveDataUtils.java

@@ -20,6 +20,7 @@ import com.liquidnet.service.sweet.entity.SweetRichtextFive;
 import com.liquidnet.service.sweet.mapper.*;
 import com.liquidnet.service.sweet.vo.SweetArtistsRelationVo;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
@@ -48,6 +49,7 @@ public class RedisFiveDataUtils {
     @Autowired
     private SweetArtistsMapper sweetArtistsMapper;
     @Autowired
+    @Lazy
     private FeignSlimeApiClient feignSlimeApiClient;
 
     public List<SweetManualAppletFiveDto> setPushList() {

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisMDSKDataUtils.java

@@ -14,6 +14,7 @@ import com.liquidnet.service.sweet.entity.*;
 import com.liquidnet.service.sweet.mapper.*;
 import com.liquidnet.service.sweet.vo.SweetArtistsRelationVo;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
@@ -42,6 +43,7 @@ public class RedisMDSKDataUtils {
     @Autowired
     private SweetArtistsMapper sweetArtistsMapper;
     @Autowired
+    @Lazy
     private FeignSlimeApiClient feignSlimeApiClient;
 
     public List<SweetManualAppletMDSKDto> setPushList() {

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisTFCDataUtils.java

@@ -17,6 +17,7 @@ import com.liquidnet.service.sweet.entity.SweetRichtextTfc;
 import com.liquidnet.service.sweet.mapper.*;
 import com.liquidnet.service.sweet.vo.SweetArtistsRelationVo;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
@@ -43,6 +44,7 @@ public class RedisTFCDataUtils {
     @Autowired
     private SweetManualShopTfcMapper sweetManualShopTFCMapper;
     @Autowired
+    @Lazy
     private FeignSlimeApiClient feignSlimeApiClient;
 
     public List<SweetManualAppletTFCDto> setPushList() {