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

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

@@ -10,6 +10,7 @@ public class PerformanceExpressSearchAdminParam {
     // 演出搜索
     private String title;
     private String performancesId;
+    private String ticketsId;
 
     // 分页
     private Integer pageSize;

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

@@ -69,7 +69,9 @@ public class PerformancesExpressController extends BaseController {
     @RequiresPermissions("kylin:performancesExpress:performanceOrderList")
     @GetMapping("performanceOrderList/{id}")
     public String performanceOrderListView(@PathVariable("id") String id, ModelMap mmap) {
+        List<PerformancesTicketListDao> performancesTicketList = performancesExpressServiceImpl.getPerformancesTicketList(id);
         mmap.put("performancesId", id);
+        mmap.put("performancesTicketList", performancesTicketList);
         return prefix + "/performanceOrderList";
     }
 

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

@@ -67,6 +67,13 @@
                                 <option value="80">已签收</option>
                             </select>
                         </li>
+                        <li>
+                            <label>票种：</label>
+                            <select name="ticketsId">
+                                <option value="">所有</option>
+                                <option th:each="ticket : ${performancesTicketList}" th:text="${ticket.title + ticket.timeTitle}" th:value="${ticket.ticketsId}"></option>
+                            </select>
+                        </li>
                         <li>
                             <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
                                     class="fa fa-search"></i>&nbsp;搜索</a>
@@ -414,6 +421,10 @@
                         return '姓名：' + expressContacts + '<br>' + '手机号：' + expressPhone + '<br>' + '地址：' + expressAddress;
                     }
                 },
+                {
+                    field: 'number',
+                    title: '购票数量'
+                },
                 {
                     field: '',
                     title: '快递方式',

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformanceExpressPerformanceOrderListAdminDao.java

@@ -9,6 +9,7 @@ public class PerformanceExpressPerformanceOrderListAdminDao {
 
     String orderTicketsId;
     String orderCode;
+    Integer number;
     Integer status;
     BigDecimal priceExpress;
 

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml

@@ -346,6 +346,7 @@
             </if>
             <if test="expressStatus == 80">AND (oe.express_status = 80 OR oe.express_status = 8000)</if>
             <if test="mailno != ''">AND oe.mailno LIKE concat('%', #{mailno}, '%')</if>
+            <if test="ticketsId != '' and ticketsId != null">AND kotr.ticket_id = ${ticketsId} </if>
 
         </where>
     </select>

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetAppletUser.java

+package com.liquidnet.service.sweet.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 小程序登录记录用户解密后信息表
+ * </p>
+ *
+ * @author jiangxiulong
+ * @since 2021-11-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SweetAppletUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Long mid;
+
+    /**
+     * user_id
+     */
+    private String userId;
+
+    /**
+     * openId
+     */
+    @TableField("openId")
+    private String openId;
+
+    /**
+     * unionId
+     */
+    @TableField("unionId")
+    private String unionId;
+
+    /**
+     * 手机号
+     */
+    @TableField("getPhoneNumber")
+    private String getPhoneNumber;
+
+    /**
+     * 手机号
+     */
+    @TableField("getPurePhoneNumber")
+    private String getPurePhoneNumber;
+
+    /**
+     * 地区码
+     */
+    @TableField("getCountryCode")
+    private String getCountryCode;
+
+    /**
+     * 1草莓 2五百里 3mdsk 4正在
+     */
+    private Integer type;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdAt;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedAt;
+
+
+}

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/mapper/SweetAppletUserMapper.java

+package com.liquidnet.service.sweet.mapper;
+
+import com.liquidnet.service.sweet.entity.SweetAppletUser;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 小程序登录记录用户解密后信息表 Mapper 接口
+ * </p>
+ *
+ * @author jiangxiulong
+ * @since 2021-11-08
+ */
+public interface SweetAppletUserMapper extends BaseMapper<SweetAppletUser> {
+
+}

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

@@ -145,6 +145,10 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
 
         toDayList = checkAppStatus(toDayList);
         threeDaysList = checkAppStatus(threeDaysList);
+        if (null != type && type > 0) {
+            toDayList = mergeRoadList(toDayList);
+            threeDaysList = mergeRoadList(threeDaysList);
+        }
 
         HashMap<String, Object> newList = CollectionUtil.mapStringObject();
         newList.put("toDayList", toDayList);
@@ -152,6 +156,21 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
         return newList;
     }
 
+    private List<KylinPerformanceVo> mergeRoadList(List<KylinPerformanceVo> PerformanceList) {
+        List<String> roadIdList = Arrays.asList();
+        List<KylinPerformanceVo> newList = ObjectUtil.getKylinPerformanceVoArrayList();
+        for (KylinPerformanceVo info : PerformanceList) {
+            String roadShowId = info.getRoadShowId();
+            if (null != roadShowId && !roadShowId.isEmpty()) {
+                if (!roadIdList.contains(info.getRoadShowId())) {
+                    newList.add(info);
+                    roadIdList.add(roadShowId);
+                }
+            }
+        }
+        return newList;
+    }
+
     public List<KylinPerformanceVo> recommendList() {
         List<KylinPerformanceVo> performancesListRecommend = dataUtils.getPerformancesListIsRecommend();
         performancesListRecommend = checkAppStatus(performancesListRecommend);
@@ -406,7 +425,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
                 String stopSellTime = info.getStopSellTime();
                 String timeEnd = info.getTimeEnd();
                 Integer isEnd = DateUtil.compareStrDay(nowTimeStr, timeEnd);
-                if (1 == DateUtil.compareStrDay(nowTimeStr, stopSellTime) && -1 == DateUtil.compareStrDay(nowTimeStr, timeEnd)) {
+                if (1 == DateUtil.compareStrDay(nowTimeStr, stopSellTime) && -1 == DateUtil.compareStrDay(nowTimeStr, timeEnd) && 7 != info.getAppStatus()) {
                     info.setAppStatus(11);
                 }
 
@@ -441,7 +460,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
                 String stopSellTime = info.getStopSellTime();
                 String timeEnd = info.getTimeEnd();
                 Integer isEnd = DateUtil.compareStrDay(nowTimeStr, timeEnd);
-                if (1 == DateUtil.compareStrDay(nowTimeStr, stopSellTime) && -1 == DateUtil.compareStrDay(nowTimeStr, timeEnd)) {
+                if (1 == DateUtil.compareStrDay(nowTimeStr, stopSellTime) && -1 == DateUtil.compareStrDay(nowTimeStr, timeEnd) && 7 != info.getAppStatus()) {
                     info.setAppStatus(11);
                 }
 
@@ -492,14 +511,14 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
             }
             info.setTicketTimeList(ticketTimeListNew);
 
-            if (CollectionUtils.isEmpty(ticketTimeListNew)) { //列表的时候无需判断 因为列表不展示状态标签
+            if (CollectionUtils.isEmpty(ticketTimeListNew) && 7 != info.getAppStatus()) { //列表的时候无需判断 因为列表不展示状态标签
                 info.setAppStatus(11); // 所有票种下架 演出停售
             }
             // 当前时间大于停售时间 小于结束时间 是 停售
             String nowTimeStr = DateUtil.getNowTime();
             String stopSellTime = info.getStopSellTime();
             String timeEnd = info.getTimeEnd();
-            if (1 == DateUtil.compareStrDay(nowTimeStr, stopSellTime) && -1 == DateUtil.compareStrDay(nowTimeStr, timeEnd)) {
+            if (1 == DateUtil.compareStrDay(nowTimeStr, stopSellTime) && -1 == DateUtil.compareStrDay(nowTimeStr, timeEnd) && 7 != info.getAppStatus()) {
                 info.setAppStatus(11);
             }
 

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/syncRedis/UserDataController.java

@@ -92,4 +92,14 @@ public class UserDataController {
         }
     }
 
+    @GetMapping("appletUser")
+    @ApiOperation("同步小程序用户")
+    public void appletUser() {
+        try {
+            userDataService.appletUser();
+        } catch (Exception e) {
+            log.error("getUser", e);
+        }
+    }
+
 }

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

 package com.liquidnet.service.sweet.service.impl.syncRedis;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
+import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
+import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
+import com.liquidnet.service.feign.adam.api.FeignAdamBaseClient;
 import com.liquidnet.service.sweet.config.WechatMpConfigure;
+import com.liquidnet.service.sweet.entity.SweetAppletUser;
+import com.liquidnet.service.sweet.mapper.SweetAppletUserMapper;
 import com.liquidnet.service.sweet.utils.QueueUtils;
-import com.liquidnet.service.sweet.utils.RedisDataUtils;
 import com.liquidnet.service.sweet.utils.WechatUsersRedisUtils;
+import com.liquidnet.service.sweet.vo.SweetAppletUsersVo;
 import com.liquidnet.service.sweet.vo.SweetWechatUsersVo;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
@@ -32,6 +38,12 @@ public class UserDataServiceImpl {
     @Autowired
     private QueueUtils queueUtils;
 
+    @Autowired
+    SweetAppletUserMapper sweetAppletUserMapper;
+
+    @Autowired
+    private FeignAdamBaseClient feignAdamBaseClient;
+
     public void userInfo(Integer type) throws WxErrorException {
         WxMpService wxMpService = wechatMpConfigure.getWxMpService(type);
 
@@ -134,4 +146,43 @@ public class UserDataServiceImpl {
             redisUtils.setSweetWechatUsers(sweetWechatUsersVo);
         }
     }
+
+    public void appletUser() {
+        int size = 1000;
+        // 获取总记录数
+        Integer count = sweetAppletUserMapper.selectCount(Wrappers.lambdaQuery(SweetAppletUser.class));
+        // 总page
+        int countPage = (int) Math.ceil(count / size);
+        for (int page = 0; page < countPage; page++) {
+            List<SweetAppletUser> sweetAppletUsers = sweetAppletUserMapper.selectList(Wrappers.lambdaQuery(SweetAppletUser.class).last("limit " + (page * size) + "," + ((page + 1) * size)));
+            for (SweetAppletUser info : sweetAppletUsers) {
+                SweetAppletUsersVo oldInfo = redisUtils.getSweetAppletUsers(info.getGetPurePhoneNumber());
+                if (null == oldInfo) {
+                    ResponseDto<AdamUserInfoVo> userInfoVo = feignAdamBaseClient.registerByMobile(info.getGetPurePhoneNumber());
+                    AdamUserInfoVo userInfoVoData = userInfoVo.getData();
+                    String userId = userInfoVoData.getUid();
+
+                    LinkedList<String> sqlsA = CollectionUtil.linkedListString();
+                    LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
+                    sqlsA.add(SqlMapping.get("sweet_applet_users.insert"));
+                    sqlsDataA.add(new Object[]{
+                            info.getUserId(), userId, info.getOpenId(), info.getUnionId(), info.getGetPhoneNumber(), info.getGetPurePhoneNumber(), info.getGetCountryCode(), info.getType()
+                    });
+                    queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_WECHAT_USER_INSERT.getKey(),
+                            SqlMapping.gets(sqlsA, sqlsDataA));
+
+                    SweetAppletUsersVo sweetAppletUsersVo = SweetAppletUsersVo.getNew();
+                    sweetAppletUsersVo.setAppletUserId(info.getUserId());
+                    sweetAppletUsersVo.setUserId(userId);
+                    sweetAppletUsersVo.setOpenId(info.getOpenId());
+                    sweetAppletUsersVo.setUnionId(info.getUnionId());
+                    sweetAppletUsersVo.setPhoneNumber(info.getGetPhoneNumber());
+                    sweetAppletUsersVo.setPurePhoneNumber(info.getGetPurePhoneNumber());
+                    sweetAppletUsersVo.setCountryCode(info.getGetCountryCode());
+                    sweetAppletUsersVo.setType(info.getType());
+                    redisUtils.setSweetAppletUsers(sweetAppletUsersVo);
+                }
+            }
+        }
+    }
 }