Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamLoginInfoVo.java

@@ -20,7 +20,7 @@ public class AdamLoginInfoVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 14, value = "用户第三方账号信息")
     private List<AdamThirdPartInfoVo> thirdPartInfo;
     @ApiModelProperty(position = 15, value = "会员信息")
-    private AdamMemberSimpleVo memberSimpleVo;
+    private AdamMemberSimpleVo memberVo;
     @ApiModelProperty(position = 16, value = "用户会员信息")
     private AdamUserMemberVo userMemberVo;
 

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamMemberVo.java

@@ -56,7 +56,7 @@ public class AdamMemberVo implements java.io.Serializable, Cloneable {
     @ApiModelProperty(position = 21, value = "会员专属权益")
     private List<AdamMemberRightsVo> rightsVoList;
     @ApiModelProperty(position = 22, value = "用户会员信息")
-    private AdamUserMemberVo memberInfo;
+    private AdamUserMemberVo userMemberVo;
 
     private static final AdamMemberVo obj = new AdamMemberVo();
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-dev.yml

@@ -62,6 +62,7 @@ spring:
       sslEnabled: false
       database: dev_ln_scene
   redis:
+    database: 15
     port: 6379
     host: 39.106.122.201
     password: 3Xa%8p
@@ -70,4 +71,4 @@ spring:
         max-active: 8
         max-wait: -1
         max-idle: 8
-        min-idle: 0
\ No newline at end of file
+        min-idle: 0

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/order/orderList/details.html

@@ -90,7 +90,8 @@
             <label class="col-sm-3 control-label">生成时间：</label>
             <div class="col-sm-8">
                 <div class="input-group date">
-                    <input name="createdAt" th:value="*{#dates.format(orderTicketVo.createdAt, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+<!--                    <input name="createdAt" th:value="${#dates.format(orderTicketVo.createdAt, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">-->
+                    <input name="createdAt" th:value="*{orderTicketVo.createdAt}" class="form-control" placeholder="yyyy-MM-dd" type="text">
                     <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                 </div>
             </div>
@@ -135,11 +136,11 @@
             </div>
             <label class="col-sm-3 control-label">票务状态：</label>
             <div class="col-sm-3">
-                <input th:value="${ticketEntity.isPayment}" class="form-control" type="text" readonly>
+                <input th:value="${@dict.getLabel('zhengzai_payment_type',ticketEntity.isPayment)}" class="form-control" type="text" readonly>
             </div>
             <label class="col-sm-3 control-label">出票状态：</label>
             <div class="col-sm-3">
-                <input th:value="${ticketEntity.status}" class="form-control" type="text" readonly>
+                <input th:value="${@dict.getLabel('zhengzai_ticket_status',ticketEntity.status)}" class="form-control" type="text" readonly>
             </div>
         </div>
     </form>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java

@@ -157,7 +157,6 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
                     mapSql.put("status", 9);
                     mapSql.put("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                     performanceVoUtils.updatePerformanceMySql(performancesId, mapSql, performanceVoUtils.getPerformanceMisVo(performancesId), updatedAt, auditStatus);
-                    dataUtils.updatePerformanceMongo(performancesId);
                     if (sqlStatus.getStatus() >= 6 && sqlStatus.getStatus()!=7) {//若 演出上 则 线判断状态
                         performanceVoUtils.performanceVoStatus(performancesId);
                     }
@@ -467,7 +466,6 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
                         Query.query(Criteria.where("performancesId").is(performanceId).and("status").is(1)).getQueryObject(),
                         object);
 
-                dataUtils.updatePerformanceMongo(performanceId);
                 performanceVoUtils.performanceVoStatus(performanceId);
             } else {
                 HashMap<String, Object> map2 = new HashMap<>();

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/PerformanceVoUtils.java

@@ -83,7 +83,7 @@ public class PerformanceVoUtils {
         List<String> performanceIdList = new ArrayList<>();
 
         if (performanceSingleId == null) {
-            List<KylinPerformanceStatus> list = performanceStatusMapper.selectList(new UpdateWrapper<KylinPerformanceStatus>().gt("status", 6));
+            List<KylinPerformanceStatus> list = performanceStatusMapper.selectList(new UpdateWrapper<KylinPerformanceStatus>().in("status", 6,8,9));
             for (KylinPerformanceStatus item : list) {
                 performanceIdList.add(item.getPerformanceId());
             }

liquidnet-bus-client/liquidnet-client-admin/pom.xml

@@ -263,6 +263,7 @@
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-core</artifactId>
+            <version>5.6.7</version>
         </dependency>
     </dependencies>
     <repositories>
@@ -290,4 +291,4 @@
         </pluginRepository>
     </pluginRepositories>
 
-</project>
\ No newline at end of file
+</project>

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam-test.yml

@@ -3,7 +3,7 @@ liquidnet:
     updating:
       switch: false
   info:
-    port: 9001
+    port: 80
     context:
     name: liquidnet-service-adam
   logfile:

liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin-test.yml

@@ -3,7 +3,7 @@ liquidnet:
     updating:
       switch: false
   info:
-    port: 9002
+    port: 80
     context:
     name: liquidnet-service-kylin
   logfile:

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamLoginController.java

@@ -138,7 +138,7 @@ public class AdamLoginController {
             loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(userInfoVo.getUid()));
             loginInfoVo.setUserMemberVo(adamRdmService.getUserMemberVoByUid(userInfoVo.getUid()));
         }
-        loginInfoVo.setMemberSimpleVo(adamRdmService.getMemberSimpleVo());
+        loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo());
         loginInfoVo.setUserInfo(userInfoVo);
         loginInfoVo.setToken(this.ssoProcess(userInfoVo));
         return ResponseDto.success(loginInfoVo);
@@ -167,7 +167,7 @@ public class AdamLoginController {
             loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(userInfoVo.getUid()));
             loginInfoVo.setUserMemberVo(adamRdmService.getUserMemberVoByUid(userInfoVo.getUid()));
         }
-        loginInfoVo.setMemberSimpleVo(adamRdmService.getMemberSimpleVo());
+        loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo());
         loginInfoVo.setUserInfo(userInfoVo);
         loginInfoVo.setToken(this.ssoProcess(userInfoVo));
         return ResponseDto.success(AdamLoginInfoVo.getNew());
@@ -192,7 +192,7 @@ public class AdamLoginController {
             loginInfoVo.setRealNameInfo(adamRdmService.getRealInfoVoByUid(uid));
             loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(uid));
             loginInfoVo.setUserMemberVo(adamRdmService.getUserMemberVoByUid(uid));
-            loginInfoVo.setMemberSimpleVo(adamRdmService.getMemberSimpleVo());
+            loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo());
         } else {// 新账号注册
             if (!this.checkSmsCode(parameter.getMobile(), parameter.getCode()))
                 return ResponseDto.failure(ErrorMapping.get("10002"));
@@ -200,7 +200,7 @@ public class AdamLoginController {
             AdamUserInfoVo registerUserInfo = adamUserService.register(parameter);
             loginInfoVo.setUserInfo(registerUserInfo);
             loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(registerUserInfo.getUid()));
-            loginInfoVo.setMemberSimpleVo(adamRdmService.getMemberSimpleVo());
+            loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo());
         }
         loginInfoVo.setToken(this.ssoProcess(loginInfoVo.getUserInfo()));
         return ResponseDto.success(loginInfoVo);

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamMemberController.java

@@ -3,7 +3,6 @@ package com.liquidnet.service.adam.controller;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.liquidnet.commons.lang.util.CurrentUtil;
-import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.adam.dto.vo.AdamMemberSimpleVo;
 import com.liquidnet.service.adam.dto.vo.AdamMemberVo;
 import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
@@ -16,7 +15,6 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -25,7 +23,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.constraints.NotBlank;
-import java.util.Date;
 
 @ApiSupport(order = 10030)
 @Api(tags = "会员信息")
@@ -52,7 +49,9 @@ public class AdamMemberController {
 
             memberVo.setRightsVoList(adamRdmService.getMemberRightsVoByMemberId(memberVo.getMemberId()));
 
-            memberVo.setMemberInfo(adamRdmService.getUserMemberVoByUid(CurrentUtil.getCurrentUid()));
+            if (CurrentUtil.isLogged()) {
+                memberVo.setUserMemberVo(adamRdmService.getUserMemberVoByUid(CurrentUtil.getCurrentUid()));
+            }
         }
         return ResponseDto.success(memberVo);
     }