Merge branch 'dev' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev

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

@@ -2,6 +2,7 @@ package com.liquidnet.service.adam.dto.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.service.adam.entity.AdamMemberOrder;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -74,4 +75,30 @@ public class AdamMemberOrderVo implements Serializable, Cloneable {
             return new AdamMemberOrderVo();
         }
     }
+
+    public AdamMemberOrderVo copy(AdamMemberOrder source) {
+        if (null == source) return this;
+        this.setOrderNo(source.getOrderNo());
+        this.setUid(source.getUid());
+        this.setMode(source.getMode());
+        this.setMemberId(source.getMemberId());
+        this.setMemberName(source.getMemberName());
+        this.setMemberPriceId(source.getMemberPriceId());
+        this.setDays(source.getDays());
+        this.setState(source.getState());
+        this.setMemberNo(source.getMemberNo());
+        this.setBirthday(source.getBirthday());
+        this.setDeviceFrom(source.getDeviceFrom());
+        this.setPayType(source.getPayType());
+        this.setPayNo(source.getPayNo());
+        this.setPaymentAt(source.getPaymentAt());
+        this.setCreatedAt(source.getCreatedAt());
+        this.setUpdatedAt(source.getUpdatedAt());
+        this.setPrice(source.getPrice());
+        this.setPricePaid(source.getPricePaid());
+        this.setClientIp(source.getClientIp());
+        this.setSource(source.getSource());
+        this.setVersion(source.getVersion());
+        return this;
+    }
 }

liquidnet-bus-api/liquidnet-service-kylin-api/pom.xml

@@ -19,4 +19,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>
\ No newline at end of file

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceAdminListParam.java

@@ -40,18 +40,18 @@ public class PerformanceAdminListParam {
         this.stopSellTime = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(now.plusDays(-stopSellDay));
     }
 
-    @ApiModelProperty(hidden = true)
-    private Integer page;
-    @ApiModelProperty(hidden = true)
-    private Integer size;
-
-    public void setPageNum(Integer pageNum){
-        this.pageNum=pageNum;
-        this.page=pageNum;
-    }
-
-    public void setPageSize(Integer pageSize){
-        this.pageSize=pageSize;
-        this.size=pageSize;
-    }
+//    @ApiModelProperty(hidden = true)
+//    private Integer page;
+//    @ApiModelProperty(hidden = true)
+//    private Integer size;
+//
+//    public void setPageNum(Integer pageNum){
+//        this.pageNum=pageNum;
+//        this.page=pageNum;
+//    }
+//
+//    public void setPageSize(Integer pageSize){
+//        this.pageSize=pageSize;
+//        this.size=pageSize;
+//    }
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/IKylinPerformancesAdminService.java

@@ -47,7 +47,7 @@ public interface IKylinPerformancesAdminService extends IService<KylinPerformanc
      * @param performanceAdminListParam 列表搜索参数
      * @return 分页 sql 数据
      */
-    List<PerformanceAdminListDao> getList(PerformanceAdminListParam performanceAdminListParam);
+    PageInfo<PerformanceAdminListDao> getList(PerformanceAdminListParam performanceAdminListParam);
 
     /**
      * 根据巡演id 查询演出列表 简易

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinPerformancesController.java

@@ -60,9 +60,12 @@ public class KylinPerformancesController extends BaseController {
     @PostMapping("/list")
     @ResponseBody
     public TableDataInfo list(PerformanceAdminListParam performanceAdminListParam) {
-        startPage();/**/
-        List<PerformanceAdminListDao> result = kylinPerformancesService.getList(performanceAdminListParam);
-        return getDataTable(result);
+        PageInfo<PerformanceAdminListDao> result = kylinPerformancesService.getList(performanceAdminListParam);
+        TableDataInfo rspData = new TableDataInfo();
+        rspData.setCode(0);
+        rspData.setRows(result.getList());
+        rspData.setTotal(result.getTotal());
+        return rspData;
     }
 
     @RequiresPermissions("kylin:performances:detail")
@@ -151,8 +154,8 @@ public class KylinPerformancesController extends BaseController {
     @RequiresPermissions("kylin:performances:agent")
     @PostMapping(value = "/agent/change")
     @ResponseBody
-    public AjaxResult changeTicketAgent(@RequestParam("performancesId") String performancesId,@RequestParam("ticketsId") String ticketsId, @RequestParam("status") Integer status) {
-        boolean result = kylinPerformancesService.changeTicketAgent(performancesId,ticketsId, status);
+    public AjaxResult changeTicketAgent(@RequestParam("performancesId") String performancesId, @RequestParam("ticketsId") String ticketsId, @RequestParam("status") Integer status) {
+        boolean result = kylinPerformancesService.changeTicketAgent(performancesId, ticketsId, status);
         return toAjax(result);
     }
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/static/ruoyi/js/ry-ui.js

@@ -1705,4 +1705,4 @@ modal_status = {
     SUCCESS: "success",
     FAIL: "error",
     WARNING: "warning"
-};
+};
\ No newline at end of file

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/system/dict/type/type.html

@@ -36,7 +36,7 @@
 					</div>
 				</form>
 			</div>
-			
+
 	       <div class="btn-group-sm" id="toolbar" role="group">
 	            <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:dict:add">
 	                <i class="fa fa-plus"></i> 新增
@@ -54,7 +54,7 @@
 		            <i class="fa fa-refresh"></i> 清理缓存
 		        </a>
 	        </div>
-	        
+
 	        <div class="col-sm-12 select-table table-striped">
 			    <table id="bootstrap-table"></table>
 			</div>
@@ -138,11 +138,11 @@
 		    var url = prefix + '/detail/' + dictId;
 		    $.modal.openTab("字典数据", url);
 		}
-		
+
 		/** 清理字典缓存 */
         function clearCache() {
             $.operate.get(prefix + "/clearCache");
         }
 	</script>
 </body>
-</html>
+</html>
\ No newline at end of file

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/performances.html

@@ -76,23 +76,23 @@
             </form>
         </div>
 
-        <div class="btn-group-sm" id="toolbar" role="group">
-            <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="kylin:performances:add">
-                <i class="fa fa-plus"></i> 添加
-            </a>
-            <a class="btn btn-primary single disabled" onclick="$.operate.edit()"
-               shiro:hasPermission="kylin:performances:edit">
-                <i class="fa fa-edit"></i> 修改
-            </a>
-            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()"
-               shiro:hasPermission="kylin:performances:remove">
-                <i class="fa fa-remove"></i> 删除
-            </a>
-            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="kylin:performances:export">
-                <i class="fa fa-download"></i> 导出
-            </a>
-        </div>
-        <div class="col-sm-12 select-table table-bordered">
+<!--        <div class="btn-group-sm" id="toolbar" role="group">-->
+<!--            <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="kylin:performances:add">-->
+<!--                <i class="fa fa-plus"></i> 添加-->
+<!--            </a>-->
+<!--            <a class="btn btn-primary single disabled" onclick="$.operate.edit()"-->
+<!--               shiro:hasPermission="kylin:performances:edit">-->
+<!--                <i class="fa fa-edit"></i> 修改-->
+<!--            </a>-->
+<!--            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()"-->
+<!--               shiro:hasPermission="kylin:performances:remove">-->
+<!--                <i class="fa fa-remove"></i> 删除-->
+<!--            </a>-->
+<!--            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="kylin:performances:export">-->
+<!--                <i class="fa fa-download"></i> 导出-->
+<!--            </a>-->
+<!--        </div>-->
+        <div class="col-sm-12 select-table table-striped">
             <table id="bootstrap-table"></table>
         </div>
     </div>

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

@@ -201,14 +201,12 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
     }
 
     @Override
-    public List<PerformanceAdminListDao> getList(PerformanceAdminListParam performanceAdminListParam) {
+    public PageInfo<PerformanceAdminListDao> getList(PerformanceAdminListParam performanceAdminListParam) {
+        PageInfo<PerformanceAdminListDao> pageInfo;
         List<PerformanceAdminListDao> newList = new ArrayList();
         try {
             Map<String, Object> map = BeanUtil.convertBeanToMap(performanceAdminListParam);
             List<PerformanceAdminListDao> voList = performancesMapper.misPerformanceList(map);
-
-
-
             for (PerformanceAdminListDao item : voList) {
                 item.setStatus(item.getStatus());
                 if(item.getStatus() >=6 && item.getStatus()!=7){
@@ -222,11 +220,12 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
                 }
                 newList.add(item);
             }
+            pageInfo = new PageInfo(voList);
         } catch (Exception e) {
             e.printStackTrace();
             return null;
         }
-        return newList;
+        return pageInfo;
     }
 
     @Override

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

@@ -162,11 +162,11 @@ public class AdamLoginController {
 
         AdamLoginInfoVo loginInfoVo = AdamLoginInfoVo.getNew();
         if (!toRegister) {
-            loginInfoVo.setRealNameInfo(adamRdmService.getRealInfoVoByUid(userInfoVo.getUid()));
-            loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(userInfoVo.getUid()));
+//            loginInfoVo.setRealNameInfo(adamRdmService.getRealInfoVoByUid(userInfoVo.getUid()));
+//            loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(userInfoVo.getUid()));
             loginInfoVo.setUserMemberVo(adamRdmService.getUserMemberVoByUid(userInfoVo.getUid()));
         }
-        loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo());
+//        loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo());
         loginInfoVo.setUserInfo(userInfoVo);
         loginInfoVo.setToken(this.ssoProcess(userInfoVo));
         loginInfoVo.getUserInfo().setMobile(SensitizeUtil.custom(userInfoVo.getMobile(), 3, 4));
@@ -199,11 +199,11 @@ public class AdamLoginController {
 
         AdamLoginInfoVo loginInfoVo = AdamLoginInfoVo.getNew();
         if (!toRegister) {
-            loginInfoVo.setRealNameInfo(adamRdmService.getRealInfoVoByUid(userInfoVo.getUid()));
-            loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(userInfoVo.getUid()));
+//            loginInfoVo.setRealNameInfo(adamRdmService.getRealInfoVoByUid(userInfoVo.getUid()));
+//            loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(userInfoVo.getUid()));
             loginInfoVo.setUserMemberVo(adamRdmService.getUserMemberVoByUid(userInfoVo.getUid()));
         }
-        loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo());
+//        loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo());
         loginInfoVo.setUserInfo(userInfoVo);
         loginInfoVo.setToken(this.ssoProcess(userInfoVo));
         loginInfoVo.getUserInfo().setMobile(SensitizeUtil.custom(userInfoVo.getMobile(), 3, 4));
@@ -226,10 +226,10 @@ public class AdamLoginController {
             if (StringUtils.isEmpty(uid)) return ResponseDto.failure(ErrorMapping.get("10006"));
 
             loginInfoVo.setUserInfo(adamRdmService.getUserInfoVoByUid(uid));
-            loginInfoVo.setRealNameInfo(adamRdmService.getRealInfoVoByUid(uid));
-            loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(uid));
+//            loginInfoVo.setRealNameInfo(adamRdmService.getRealInfoVoByUid(uid));
+//            loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(uid));
             loginInfoVo.setUserMemberVo(adamRdmService.getUserMemberVoByUid(uid));
-            loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo());
+//            loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo());
         } else {// 新账号注册
             if (!this.checkSmsCode(parameter.getMobile(), parameter.getCode())) {
                 return ResponseDto.failure(ErrorMapping.get("10004"));
@@ -240,7 +240,7 @@ public class AdamLoginController {
             }
             loginInfoVo.setUserInfo(registerUserInfo);
             loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(registerUserInfo.getUid()));
-            loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo());
+//            loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo());
         }
         loginInfoVo.setToken(this.ssoProcess(loginInfoVo.getUserInfo()));
         loginInfoVo.getUserInfo().setMobile(SensitizeUtil.custom(loginInfoVo.getUserInfo().getMobile(), 3, 4));

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

@@ -35,68 +35,70 @@ public class AdamDMAdminController extends AdamBaseController {
     DMAddressesProcessor dmAddressesProcessor;
     @Autowired
     DMTracesInfoProcessor dmTracesInfoProcessor;
+    @Autowired
+    DMMemberOrderProcessor dmMemberOrderProcessor;
 
     @ApiOperationSupport(order = 0)
     @ApiOperation(value = "user")
     @GetMapping(value = {"user"})
-    public ResponseDto<Object> dataMigrationForUser(@RequestParam boolean flg) {
-        dmUserInformationProcessor.handler(flg);
+    public ResponseDto<Object> dataMigrationForUser() {
+        dmUserInformationProcessor.handler();
         return ResponseDto.success();
     }
 
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "tpa")
     @GetMapping(value = {"tpa"})
-    public ResponseDto<Object> dataMigrationForTpa(@RequestParam boolean flg) {
-        dmThirdPartsProcessor.handler(flg);
+    public ResponseDto<Object> dataMigrationForTpa() {
+        dmThirdPartsProcessor.handler();
         return ResponseDto.success();
     }
 
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "real")
     @GetMapping(value = {"real"})
-    public ResponseDto<Object> dataMigrationForReal(@RequestParam boolean flg) {
-        dmRealNameProcessor.handler(flg);
+    public ResponseDto<Object> dataMigrationForReal() {
+        dmRealNameProcessor.handler();
         return ResponseDto.success();
     }
 
     @ApiOperationSupport(order = 3)
     @ApiOperation(value = "vip")
     @GetMapping(value = {"vip"})
-    public ResponseDto<Object> dataMigrationForVip(@RequestParam boolean flg) {
-        dmUserMemberProcessor.handler(flg);
+    public ResponseDto<Object> dataMigrationForVip() {
+        dmUserMemberProcessor.handler();
         return ResponseDto.success();
     }
 
     @ApiOperationSupport(order = 4)
     @ApiOperation(value = "traces")
     @GetMapping(value = {"traces"})
-    public ResponseDto<Object> dataMigrationForTraces(@RequestParam boolean flg) {
-        dmTracesInfoProcessor.handler(flg);
+    public ResponseDto<Object> dataMigrationForTraces() {
+        dmTracesInfoProcessor.handler();
         return ResponseDto.success();
     }
 
     @ApiOperationSupport(order = 5)
     @ApiOperation(value = "enters")
     @GetMapping(value = {"enters"})
-    public ResponseDto<Object> dataMigrationForEnters(@RequestParam boolean flg) {
-        dmEntersProcessor.handler(flg);
+    public ResponseDto<Object> dataMigrationForEnters() {
+        dmEntersProcessor.handler();
         return ResponseDto.success();
     }
 
     @ApiOperationSupport(order = 6)
     @ApiOperation(value = "addr")
     @GetMapping(value = {"addr"})
-    public ResponseDto<Object> dataMigrationForAddr(@RequestParam boolean flg) {
-        dmAddressesProcessor.handler(flg);
+    public ResponseDto<Object> dataMigrationForAddr() {
+        dmAddressesProcessor.handler();
         return ResponseDto.success();
     }
 
     @ApiOperationSupport(order = 7)
     @ApiOperation(value = "morder")
     @GetMapping(value = {"morder"})
-    public ResponseDto<Object> dataMigrationForMOrder(@RequestParam boolean flg) {
-
+    public ResponseDto<Object> dataMigrationForMOrder() {
+        dmMemberOrderProcessor.handler();
         return ResponseDto.success();
     }
 }

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

@@ -16,6 +16,7 @@ import java.util.Arrays;
 import java.util.List;
 
 public abstract class DataMigrationProcessorService {
+    public static final String DM_FLG = "flg";
     public static final String DM_FLUSH = "flu";
     public static List<String> reUidList = new ArrayList<>();
     static {
@@ -29,11 +30,11 @@ public abstract class DataMigrationProcessorService {
     public PreparedStatement statement = null;
     public ResultSetImpl row = null;
 
-    public void handler(boolean flg) {
+    public void handler() {
         preHandler();
 
         try {
-            dataProcessing(flg);
+            dataProcessing();
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -54,7 +55,7 @@ public abstract class DataMigrationProcessorService {
         connection = DriverManager.getConnection(url, "readonly", "ZWDsf8Fy");
     }
 
-    protected abstract void dataProcessing(boolean flg);
+    protected abstract void dataProcessing();
 
     private void postHandler() {
         try {

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMAddressesProcessor.java

@@ -17,6 +17,8 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
+
 @Slf4j
 @Service
 public class DMAddressesProcessor extends DataMigrationProcessorService {
@@ -29,8 +31,10 @@ public class DMAddressesProcessor extends DataMigrationProcessorService {
 
     @SneakyThrows
     @Override
-    protected void dataProcessing(boolean flg) {
-        if (StringUtils.isNotEmpty(ServletUtils.getRequest().getParameter(DM_FLUSH))) {
+    protected void dataProcessing() {
+        HttpServletRequest request = ServletUtils.getRequest();
+        String flg = StringUtils.defaultIfBlank(request.getParameter(DM_FLG), "");
+        if (StringUtils.isNotEmpty(request.getParameter(DM_FLUSH))) {
             log.info("DM.flush.addresses:{}", userMapper.executeForDM("adam_addresses"));
 
             log.info("DM.flush.AdamAddressesVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamAddressesVo.class.getSimpleName()).getDeletedCount());
@@ -41,7 +45,7 @@ public class DMAddressesProcessor extends DataMigrationProcessorService {
 //                     1-id,2-user_id,3-user_name,4-user_phone,5-province,6-city,7-county,8-user_address,9-defaultDelivery,10-created_at
         String sql = sqlCount.replace("count(1)", field);
 
-        if (flg) {
+        if ("1".equals(flg)) {
             sqlCount += " and user_id in ('2026628','544327','1997335','773650','809406')";
             sql += " and user_id in ('2026628','544327','1997335','773650','809406')";
         }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMEntersProcessor.java

@@ -17,6 +17,8 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
+
 @Slf4j
 @Service
 public class DMEntersProcessor extends DataMigrationProcessorService {
@@ -29,8 +31,10 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
 
     @SneakyThrows
     @Override
-    protected void dataProcessing(boolean flg) {
-        if (StringUtils.isNotEmpty(ServletUtils.getRequest().getParameter(DM_FLUSH))) {
+    protected void dataProcessing() {
+        HttpServletRequest request = ServletUtils.getRequest();
+        String flg = StringUtils.defaultIfBlank(request.getParameter(DM_FLG), "");
+        if (StringUtils.isNotEmpty(request.getParameter(DM_FLUSH))) {
             log.info("DM.flush.enters:{}", userMapper.executeForDM("adam_enters"));
 
             log.info("DM.flush.AdamEntersVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamEntersVo.class.getSimpleName()).getDeletedCount());
@@ -41,7 +45,7 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
 //                     1-id,2-user_id,3-type,4-`name`,5-mobile,6-idcode,7-if(is_default='no', 0, 1),8-created_at
         String sql = sqlCount.replace("count(1)", field);
 
-        if (flg) {
+        if ("1".equals(flg)) {
             sqlCount += " and user_id in ('2026628','544327','1997335','773650','809406')";
             sql += " and user_id in ('2026628','544327','1997335','773650','809406')";
         }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMMemberOrderProcessor.java

+package com.liquidnet.service.adam.service.processor;
+
+import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.commons.lang.util.ServletUtils;
+import com.liquidnet.service.adam.dto.vo.AdamMemberOrderVo;
+import com.liquidnet.service.adam.entity.AdamMemberOrder;
+import com.liquidnet.service.adam.mapper.AdamMemberOrderMapper;
+import com.liquidnet.service.adam.service.DataMigrationProcessorService;
+import com.mysql.cj.jdbc.result.ResultSetImpl;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+
+@Slf4j
+@Service
+public class DMMemberOrderProcessor extends DataMigrationProcessorService {
+    @Autowired
+    MongoTemplate mongoTemplate;
+    @Autowired
+    RedisUtil redisUtil;
+    @Autowired
+    AdamMemberOrderMapper memberOrderMapper;
+
+    public static final String MEMBER_NAME = "摩登天空会员";
+    public static final String MEMBER_ID = "1";
+
+    // APPWEPAY|APPALIPAY|WAPWEPAY|WAPALIPAY|JSWEPAY|GIFT_CODE|VIP_CODE|APPLETWEPAY
+    public static final Map<String, String> dfMap = new HashMap<>();
+    public static final Map<String, String> ptMap = new HashMap<>();
+    static {
+        dfMap.put("APPWEPAY", "app");
+        dfMap.put("APPALIPAY", "app");
+        dfMap.put("WAPWEPAY", "wap");
+        dfMap.put("WAPALIPAY", "wap");
+        dfMap.put("JSWEPAY", "js");
+        dfMap.put("APPLETWEPAY", "applet");
+        dfMap.put("APPLETALIPAY", "applet");
+
+        ptMap.put("APPWEPAY", "wepay");
+        ptMap.put("APPALIPAY", "alipay");
+        ptMap.put("WAPWEPAY", "wepay");
+        ptMap.put("WAPALIPAY", "alipay");
+        ptMap.put("JSWEPAY", "wepay");
+        ptMap.put("APPLETWEPAY", "wepay");
+        ptMap.put("APPLETALIPAY", "alipay");
+    }
+
+    @SneakyThrows
+    @Override
+    protected void dataProcessing() {
+        HttpServletRequest request = ServletUtils.getRequest();
+        String flg = StringUtils.defaultIfBlank(request.getParameter(DM_FLG), "");
+        if (StringUtils.isNotEmpty(request.getParameter(DM_FLUSH))) {
+            log.info("DM.flush.user_member:{}", userMapper.executeForDM("adam_member_order"));
+
+            log.info("DM.flush.AdamUserMemberVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamMemberOrder.class.getSimpleName()).getDeletedCount());
+        }
+
+        String sqlCount = "select count(1) from user_vip_card_orders where status in (1,5)";
+        String field = "order_code,uid,order_sub_type,vip_card_price,price,status,card_number,birthday,pay_type,pay_code,pay_at,created_at,updated_at,client_ip,source,version";
+//      1-order_code,2-uid,3-order_sub_type,4-vip_card_price,5-price,6-status,7-card_number,8-birthday,
+//      9-pay_type,10-pay_code,11-pay_at,12-created_at,13-updated_at,14-client_ip,15-source,16-version
+        String sql = sqlCount.replace("count(1)", field);
+
+        if ("1".equals(flg)) {
+            sqlCount += " and uid in ('2026628','544327','1997335','773650','809406')";
+            sql += " and uid in ('2026628','544327','1997335','773650','809406')";
+        }
+
+        sql += " limit ?,?";
+
+        statement = connection.prepareStatement(sqlCount);
+        row = (ResultSetImpl) statement.executeQuery();
+        row.first();
+        int ct = row.getInt(1), pSize = 1000, num = 0;
+        log.info("DM数据迁移总数:{}", ct);
+
+
+        while (ct > 0) {
+            statement = connection.prepareStatement(sql);
+            statement.setInt(1, pSize * num);
+            statement.setInt(2, pSize);
+            row = (ResultSetImpl) statement.executeQuery();
+            log.info("DM.execute.limit:[pNo:{},pSize:{}]", pSize * num, pSize);
+            while (row.next()) {
+                String uid = row.getString(1);
+
+                if (!reUidList.contains(uid)) {
+                    AdamMemberOrder memberOrder = new AdamMemberOrder();
+                    memberOrder.setOrderNo(row.getString(1));
+                    memberOrder.setUid(row.getString(2));
+                    memberOrder.setMode(row.getInt(3));
+                    memberOrder.setPrice(row.getBigDecimal(4));
+                    memberOrder.setPricePaid(row.getBigDecimal(5));
+                    memberOrder.setMemberName(MEMBER_NAME);
+                    memberOrder.setMemberId(MEMBER_ID);
+                    memberOrder.setMemberPriceId(MEMBER_ID);
+                    memberOrder.setDays(365);
+                    memberOrder.setState(row.getInt(6));
+                    memberOrder.setMemberNo(row.getString(7));
+                    memberOrder.setBirthday(row.getString(8));
+                    String payType = row.getString(9);
+                    memberOrder.setDeviceFrom(dfMap.get(payType));
+                    memberOrder.setPayType(ptMap.get(payType));
+                    memberOrder.setPayNo(row.getString(10));
+                    memberOrder.setPaymentAt(row.getLocalDateTime(11));
+                    memberOrder.setCreatedAt(row.getLocalDateTime(12));
+                    memberOrder.setUpdatedAt(row.getLocalDateTime(13));
+                    memberOrder.setClientIp(row.getString(14));
+                    memberOrder.setSource(row.getString(15));
+                    memberOrder.setVersion(row.getString(16));
+
+                    AdamMemberOrderVo vo = AdamMemberOrderVo.getNew().copy(memberOrder);
+
+                    memberOrderMapper.insert(memberOrder);
+
+                    mongoTemplate.insert(vo, AdamMemberOrderVo.class.getSimpleName());
+                }
+            }
+
+
+            num++;
+            ct -= pSize;
+        }
+    }
+}

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMRealNameProcessor.java

@@ -16,6 +16,8 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
+
 @Slf4j
 @Service
 public class DMRealNameProcessor extends DataMigrationProcessorService {
@@ -28,8 +30,10 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
 
     @SneakyThrows
     @Override
-    protected void dataProcessing(boolean flg) {
-        if (StringUtils.isNotEmpty(ServletUtils.getRequest().getParameter(DM_FLUSH))) {
+    protected void dataProcessing() {
+        HttpServletRequest request = ServletUtils.getRequest();
+        String flg = StringUtils.defaultIfBlank(request.getParameter(DM_FLG), "");
+        if (StringUtils.isNotEmpty(request.getParameter(DM_FLUSH))) {
             log.info("DM.flush.real_name:{}", userMapper.executeForDM("adam_real_name"));
 
             log.info("DM.flush.AdamRealInfoVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamRealInfoVo.class.getSimpleName()).getDeletedCount());
@@ -40,7 +44,7 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
 //                     1-id,2-uid,3-real_name,4-id_card,5-created_at,6-updated_at
         String sql = sqlCount.replace("count(1)", field);
 
-        if (flg) {
+        if ("1".equals(flg)) {
             sqlCount += " and uid in ('2026628','544327','1997335','773650','809406')";
             sql += " and uid in ('2026628','544327','1997335','773650','809406')";
         }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMThirdPartsProcessor.java

@@ -16,6 +16,8 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
+
 @Slf4j
 @Service
 public class DMThirdPartsProcessor extends DataMigrationProcessorService {
@@ -28,8 +30,10 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
 
     @SneakyThrows
     @Override
-    protected void dataProcessing(boolean flg) {
-        if (StringUtils.isNotEmpty(ServletUtils.getRequest().getParameter(DM_FLUSH))) {
+    protected void dataProcessing() {
+        HttpServletRequest request = ServletUtils.getRequest();
+        String flg = StringUtils.defaultIfBlank(request.getParameter(DM_FLG), "");
+        if (StringUtils.isNotEmpty(request.getParameter(DM_FLUSH))) {
             log.info("DM.flush.third_party:{}", userMapper.executeForDM("adam_third_party"));
 
             log.info("DM.flush.AdamThirdPartInfoVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamThirdPartInfoVo.class.getSimpleName()).getDeletedCount());
@@ -40,7 +44,7 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
 //                     1-uid,2-open_id,3-avatar,4-nickname,5-type,6-created_at,7-updated_at
         String sql = sqlCount.replace("count(1)", field);
 
-        if (flg) {
+        if ("1".equals(flg)) {
             sqlCount += " and uid in ('2026628','544327','1997335','773650','809406')";
             sql += " and uid in ('2026628','544327','1997335','773650','809406')";
         }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMTracesInfoProcessor.java

@@ -36,8 +36,9 @@ public class DMTracesInfoProcessor extends DataMigrationProcessorService {
     AdamMemberPriceMapper memberPriceMapper;
 
     @Override
-    protected void dataProcessing(boolean flg) {
-        if (StringUtils.isNotEmpty(ServletUtils.getRequest().getParameter(DM_FLUSH))) {
+    protected void dataProcessing() {
+        HttpServletRequest request = ServletUtils.getRequest();
+        if (StringUtils.isNotEmpty(request.getParameter(DM_FLUSH))) {
             log.info("DM.flush.member:{}", userMapper.executeForDM("adam_member"));
             log.info("DM.flush.member_price:{}", userMapper.executeForDM("adam_member_price"));
 

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMUserInformationProcessor.java

@@ -22,6 +22,7 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
 import java.sql.SQLException;
 import java.util.*;
 
@@ -48,8 +49,10 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
 
     @SneakyThrows
     @Override
-    protected void dataProcessing(boolean flg) {
-        if (StringUtils.isNotEmpty(ServletUtils.getRequest().getParameter(DM_FLUSH))) {
+    protected void dataProcessing() {
+        HttpServletRequest request = ServletUtils.getRequest();
+        String flg = StringUtils.defaultIfBlank(request.getParameter(DM_FLG), "");
+        if (StringUtils.isNotEmpty(request.getParameter(DM_FLUSH))) {
             log.info("DM.flush.user:{}", userMapper.executeForDM("adam_user"));
             log.info("DM.flush.user_info:{}", userMapper.executeForDM("adam_user_info"));
 
@@ -61,7 +64,7 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
 //                     1-uid,2-mobile,3-username,4-sex,5-birthday,6-area,7-sign,8-face_url,9-back_url,10-created_at,11-updated_at,12-is_complete,13-rong_cloud_token,14-rong_cloud_tag
         String sql = sqlCount.replace("count(1)", field);
 
-        if (flg) {
+        if ("1".equals(flg)) {
             sqlCount += "and mobile in ('13753596360','17701223310','18518013286','18548596019','15901093014')";
             sql += " and mobile in ('13753596360','17701223310','18518013286','18548596019','15901093014')";
         }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMUserMemberProcessor.java

@@ -31,8 +31,10 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
 
     @SneakyThrows
     @Override
-    protected void dataProcessing(boolean flg) {
-        if (StringUtils.isNotEmpty(ServletUtils.getRequest().getParameter(DM_FLUSH))) {
+    protected void dataProcessing() {
+        HttpServletRequest request = ServletUtils.getRequest();
+        String flg = StringUtils.defaultIfBlank(request.getParameter(DM_FLG), "");
+        if (StringUtils.isNotEmpty(request.getParameter(DM_FLUSH))) {
             log.info("DM.flush.user_member:{}", userMapper.executeForDM("adam_user_member"));
 
             log.info("DM.flush.AdamUserMemberVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamUserMemberVo.class.getSimpleName()).getDeletedCount());
@@ -43,7 +45,7 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
 //                     1-uid,2-card_id,3-card_number,4-status,5-expired_at,6-created_at,7-updated_at
         String sql = sqlCount.replace("count(1)", field);
 
-        if (flg) {
+        if ("1".equals(flg)) {
             sqlCount += " and uid in ('2026628','544327','1997335','773650','809406')";
             sql += " and uid in ('2026628','544327','1997335','773650','809406')";
         }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java

@@ -146,7 +146,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
 
         KylinPerformanceVo performancesInfo = dataUtils.getPerformanceVo(performancesId);
 
-        performancesInfo = checkAppStatus(performancesInfo);
+        performancesInfo = checkAppStatusInfo(performancesInfo);
 
         performancesInfo.setMessage(KylinPerformanceStatusEnum.getName(performancesInfo.getAppStatus()));
 
@@ -167,7 +167,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
 
     public HashMap<String, Object> ticketTimesPartner(String performancesId, Integer isAgent) {
         KylinPerformanceVo vo = dataUtils.getPerformanceVo(performancesId);
-        vo = checkAppStatus(vo);
+        vo = checkAppStatusInfo(vo);
 
         List<KylinTicketTimesVo> ticketTimesList = vo.getTicketTimeList();
         for (KylinTicketTimesVo partner : ticketTimesList) {
@@ -278,6 +278,8 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
     public PayDetailVo payDetail(String performancesId, String ticketsId) {
         KylinTicketVo ticketVo = null;
         KylinPerformanceVo performancesInfo = dataUtils.getPerformanceVo(performancesId);
+        performancesInfo = checkAppStatusInfo(performancesInfo);
+
         for (int i = 0; i < performancesInfo.getTicketTimeList().size(); i++) {
             for (int x = 0; x < performancesInfo.getTicketTimeList().get(i).getTicketList().size(); x++) {
                 KylinTicketVo ticketItem = performancesInfo.getTicketTimeList().get(i).getTicketList().get(x);
@@ -291,8 +293,6 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
             }
         }
 
-        performancesInfo = checkAppStatus(performancesInfo);
-
         performancesInfo.setMessage(KylinPerformanceStatusEnum.getName(performancesInfo.getAppStatus()));
 
         PayDetailVo payDetailVo = new PayDetailVo();
@@ -323,8 +323,33 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         return list;
     }
 
-    public KylinPerformanceVo checkAppStatus(KylinPerformanceVo info) {
+    public KylinPerformanceVo checkAppStatusInfo(KylinPerformanceVo info) {
         if (null != info) {
+            List<KylinTicketTimesVo> ticketTimeList = info.getTicketTimeList();
+            List<KylinTicketTimesVo> ticketTimeListNew = new ArrayList<>();
+            for (KylinTicketTimesVo ticketTime : ticketTimeList) {
+                List<KylinTicketVo> ticketList = ticketTime.getTicketList();
+                List<KylinTicketVo> ticketListNew = new ArrayList<>();
+                for (KylinTicketVo ticket : ticketList) {
+                    int status = checkTicketStatus(ticket);
+                    ticket.setStatus(status);
+                    // 会员状态
+                    Integer isMemberStatus = getIsMemberStatus(ticket);
+                    ticket.setIsMemberStatus(isMemberStatus);
+                    if (ticket.getStatus() != 7) {
+                        ticketListNew.add(ticket);
+                    }
+                }
+                if (!CollectionUtils.isEmpty(ticketListNew)) {
+                    ticketTime.setTicketList(ticketListNew);
+                    ticketTimeListNew.add(ticketTime);
+                }
+            }
+            info.setTicketTimeList(ticketTimeListNew);
+            if (CollectionUtils.isEmpty(ticketTimeListNew)) {
+                info.setAppStatus(8);
+            }
+
             String nowTimeStr = DateUtil.getNowTime();
             String timeStart = info.getSellTime();
             String timeEnd = info.getStopSellTime();