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

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

@@ -43,14 +43,14 @@ public class TicketCreateParam implements Serializable {
     private Integer isElectronic;
 
     @ApiModelProperty(value = "是否电子票", example = "0")
-    private String expressDescribes;
+    private String describesExpress;
 
     @ApiModelProperty(value = "是否快递票", example = "0")
     @NotNull(message = "不能为空")
     private Integer isExpress;
 
     @ApiModelProperty(value = "是否电子票", example = "0")
-    private String electronicDescribe;
+    private String describeElectronic;
 
     @ApiModelProperty(value = "价格", example = "100.00")
     @NotNull(message = "不能为空")
@@ -143,4 +143,4 @@ public class TicketCreateParam implements Serializable {
             kylinTicketRelations.setUpdatedAt(updatedAt);
         return kylinTicketRelations;
     }
-}
\ No newline at end of file
+}

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

@@ -12,7 +12,6 @@ import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dao.OrderRefundDao;
 import com.liquidnet.service.kylin.dto.param.RefundApplyParam;
 import com.liquidnet.service.kylin.dto.param.RefundSearchParam;
-import com.liquidnet.service.kylin.dto.vo.admin.OrderDetailsAdminVo;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo;
 import com.liquidnet.service.kylin.dto.vo.returns.RefundOrderDetailsVo;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -191,11 +190,11 @@ public class KylinOrderRefundAdminController extends BaseController {
     @ResponseBody
     public AjaxResult refundCompleted(RefundApplyParam refundApplyParam) {
         try {
-            Boolean res = kylinOrderRefundsServiceImpl.refundCompleted(refundApplyParam);
-            if (res) {
+            ResponseDto res = kylinOrderRefundsServiceImpl.refundCompleted(refundApplyParam);
+            if (res.isSuccess()) {
                 return success();
             } else {
-                return error("关闭订单失败");
+                return error(res.getMessage());
             }
         } catch (Exception e) {
             return error(e.getMessage());

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

@@ -181,7 +181,7 @@
             var entitiesPrice = $.table.selectColumns("price");
             data.push({"name":"entitiesPrice","value":entitiesPrice});
             console.log(data)
-            // $.operate.save(prefix + "/apply", data);
+            $.operate.save(prefix + "/apply", data);
         }
     }
 </script>

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

 package com.liquidnet.client.admin.zhengzai.kylin.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.liquidnet.client.admin.common.utils.DateUtils;
+import com.liquidnet.client.admin.common.utils.ShiroUtils;
+import com.liquidnet.client.admin.zhengzai.kylin.utils.DataUtils;
 import com.liquidnet.commons.lang.util.BeanUtil;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
@@ -11,6 +15,7 @@ import com.liquidnet.service.kylin.dao.KylinOrderRefundsEntitiesDao;
 import com.liquidnet.service.kylin.dao.KylinOrderTicketEntitiesDao;
 import com.liquidnet.service.kylin.dao.OrderRefundDao;
 import com.liquidnet.service.kylin.dto.param.RefundApplyParam;
+import com.liquidnet.service.kylin.dto.param.RefundCallbackParam;
 import com.liquidnet.service.kylin.dto.param.RefundSearchParam;
 import com.liquidnet.service.kylin.dto.vo.admin.OrderDetailsAdminVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
@@ -27,7 +32,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -68,6 +76,7 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
     public ResponseDto refundApply(RefundApplyParam refundApplyParam) {
         String orderTicketsId = refundApplyParam.getOrderTicketsId();
         List<String> ticketEntityIds = refundApplyParam.getTicketEntityIds();
+        List<BigDecimal> entitiesPrice = refundApplyParam.getEntitiesPrice();
         Double RefundPriceExpress = refundApplyParam.getRefundPriceExpress();
         if (null == RefundPriceExpress) {
             RefundPriceExpress = 0.0;
@@ -132,6 +141,15 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
         }
     }
 
+    /*public Boolean refundPrice(List<String> ticketEntityIds, List<BigDecimal> entitiesPrice, String orderTicketsId) {
+        // 该订单的所有退款单
+        List<KylinOrderRefunds> refundList = kylinOrderRefundsMapper.selectList(
+                new QueryWrapper<KylinOrderRefunds>()
+                        .eq("order_tickets_id", orderTicketsId)
+                        .ne("status", KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL)
+        );
+    }*/
+
     public ResponseDto refundCheckStatus(RefundApplyParam refundApplyParam) {
         String type = refundApplyParam.getType();
         List<String> orderRefundsIdList = refundApplyParam.getIds();
@@ -203,8 +221,51 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
         }
     }
 
-    public Boolean refundCompleted(RefundApplyParam refundApplyParam) {
-        return false;
+    public ResponseDto refundCompleted(RefundApplyParam refundApplyParam) {
+        List<String> orderRefundsIdList = refundApplyParam.getIds();
+
+        KylinOrderRefunds refundInfo = kylinOrderRefundsMapper.selectOne(
+                new QueryWrapper<KylinOrderRefunds>()
+                        .in("order_refunds_id", orderRefundsIdList)
+        );
+        if (null == refundInfo) {
+            return ResponseDto.failure("退款订单查询失败");
+        }
+        if (refundInfo.getStatus() == KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL) {
+            return ResponseDto.failure("退款订单已取消");
+        }
+        if (refundInfo.getStatus() == KylinTableStatusConst.ORDER_REFUND_STATUS_REFUNDED) {
+            return ResponseDto.failure("退款订单已完成");
+        }
+
+        RefundCallbackParam refundCallbackParam = new RefundCallbackParam();
+        refundCallbackParam.setRefund_code(refundInfo.getRefundCode());
+        refundCallbackParam.setRefund_price(refundInfo.getPrice().doubleValue());
+        refundCallbackParam.setRefund_type("UNKNOWN");
+        refundCallbackParam.setRefund_id(refundInfo.getRefundId());
+        refundCallbackParam.setRefund_at(DateUtils.dateTimeNow());
+        refundCallbackParam.setRefund_error(refundInfo.getRefundError());
+        boolean res = kylinRefundsStatusServiceImpl.orderTicketRefunded(refundCallbackParam, refundInfo);
+        if (res) {
+            String authId = ShiroUtils.getUserId().toString();
+            String authName = ShiroUtils.getLoginName();
+            KylinOrderRefunds kylinOrderRefunds = new KylinOrderRefunds();
+            if (refundInfo.getAuditorId().isEmpty()) {
+                kylinOrderRefunds.setAuditorAt(LocalDateTime.now());
+                kylinOrderRefunds.setAuditorId(authId);
+                kylinOrderRefunds.setAuditorName(authName);
+            }
+            kylinOrderRefunds.setExecutorAt(LocalDateTime.now());
+            kylinOrderRefunds.setExecutorId(authId);
+            kylinOrderRefunds.setExecutorName(authName);
+            kylinOrderRefundsMapper.update(
+                    kylinOrderRefunds,
+                    new UpdateWrapper<KylinOrderRefunds>().in("order_refunds_id", refundInfo.getOrderRefundsId())
+            );
+            return ResponseDto.success();
+        } else {
+            return ResponseDto.failure("fail");
+        }
     }
 
     public KylinOrderRefundsVo detail(String orderRefundId) {

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

@@ -12,6 +12,7 @@ import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dto.param.RefundApplyParam;
+import com.liquidnet.service.kylin.dto.param.RefundCallbackParam;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
 import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
@@ -328,4 +329,96 @@ public class KylinRefundsStatusServiceImpl {
         return true;
     }
 
+    public boolean orderTicketRefunded(RefundCallbackParam refundCallbackParam, KylinOrderRefunds refundInfo) {
+        String orderTicketEntitiesIds = refundInfo.getOrderTicketEntitiesIds();
+        String[] orderTicketEntitiesIdsArr = orderTicketEntitiesIds.split(",");
+        Integer EntitiesIdsCount = orderTicketEntitiesIdsArr.length;
+        String orderTicketsId = refundInfo.getOrderTicketsId();
+
+        // 更新数据
+        // 订单状态表
+        KylinOrderTickets orderInfo = kylinOrderTicketsMapper.selectOne(
+                new QueryWrapper<KylinOrderTickets>().eq("order_tickets_id", orderTicketsId)
+        );
+        KylinOrderTicketStatus orderStatusTable = new KylinOrderTicketStatus();
+        int newStatus = 0;
+        if (EntitiesIdsCount + orderInfo.getRefundNumber() == orderInfo.getNumber()) {
+            newStatus = KylinTableStatusConst.ORDER_STATUS4;
+        } else {
+            newStatus = KylinTableStatusConst.ORDER_STATUS6;
+        }
+        orderStatusTable.setStatus(newStatus);
+        kylinOrderTicketStatusMapper.update(
+                orderStatusTable, new UpdateWrapper<KylinOrderTicketStatus>()
+                        .eq("order_id", orderTicketsId)
+        );
+
+        // 订单表
+        double price = orderInfo.getPriceRefund().doubleValue() + refundInfo.getPrice().doubleValue();
+        Integer num = orderInfo.getRefundNumber() + EntitiesIdsCount;
+        KylinOrderTickets update = new KylinOrderTickets();
+        update.setRefundNumber(num);
+        update.setPriceRefund(BigDecimal.valueOf(price));
+        kylinOrderTicketsMapper.update(
+                update, new UpdateWrapper<KylinOrderTickets>()
+                        .eq("order_tickets_id", orderTicketsId)
+        );
+        KylinOrderTicketVo kylinOrderTicketVoOrder = new KylinOrderTicketVo();
+        kylinOrderTicketVoOrder.setStatus(newStatus);
+        kylinOrderTicketVoOrder.setRefundNumber(num);
+//        kylinOrderTicketVoOrder.setPriceRefund(BigDecimal.valueOf(price));
+        BasicDBObject orderEntitiesObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketVoOrder)));
+        Document docOrder = mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).findOneAndUpdate(
+                Query.query(Criteria.where("orderTicketsId").is(orderTicketsId)).getQueryObject(),
+                orderEntitiesObject,
+                new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
+        );
+        dataUtils.delOrderTicketRedis(orderTicketsId);
+
+        // 入场人
+        for (String entitiesId : orderTicketEntitiesIdsArr) {
+            KylinOrderTicketEntities entitiesTable = new KylinOrderTicketEntities();
+            // TODO: 2021/5/27 事物 and 部分退款
+            entitiesTable.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT3);
+            kylinOrderTicketEntitiesMapper.update(entitiesTable, new UpdateWrapper<KylinOrderTicketEntities>()
+                    .eq("order_ticket_entities_id", entitiesId)
+                    .eq("is_payment", KylinTableStatusConst.ENTITIES_IS_PAYMENT2)
+            );
+
+            KylinOrderTicketEntitiesVo kylinOrderTicketEntitiesVo = new KylinOrderTicketEntitiesVo();
+            kylinOrderTicketEntitiesVo.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT3);
+            BasicDBObject entitiesObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketEntitiesVo)));
+            Document entitiesDoc = mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).findOneAndUpdate(
+                    Query.query(Criteria.where("orderTicketEntitiesId").is(entitiesId)).getQueryObject(),
+                    entitiesObject,
+                    new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
+            );
+
+            dataUtils.delOrderTicketEntitiesRedis(entitiesId);
+        }
+
+        // 退款单完成
+        KylinOrderRefunds kylinOrderRefunds = new KylinOrderRefunds();
+        kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_REFUNDED);
+        kylinOrderRefunds.setRefundCode(refundCallbackParam.getRefund_code());
+        kylinOrderRefunds.setRefundType(refundCallbackParam.getRefund_type());
+        kylinOrderRefunds.setRefundId(refundCallbackParam.getRefund_id());
+        kylinOrderRefunds.setRefundAt(refundCallbackParam.getRefund_at());
+        kylinOrderRefunds.setRefundError(refundCallbackParam.getRefund_error());
+
+        kylinOrderRefundsMapper.update(
+                kylinOrderRefunds,
+                new UpdateWrapper<KylinOrderRefunds>().in("order_refunds_id", refundInfo.getOrderRefundsId())
+        );
+
+        if (refundInfo.getType() == KylinTableStatusConst.ORDER_REFUND_TYPE_APPLY) {
+            // 退还库存
+            for (String entitiesId : orderTicketEntitiesIdsArr) {
+                dataUtils.changeSurplusGeneral(entitiesId, 1);
+            }
+        }
+
+        return true;
+    }
+
 }

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

@@ -163,6 +163,10 @@ public class DataUtils {
             try {
                 //删除redis
                 redisUtil.del(KylinRedisConst.PERFORMANCES + performanceIds);
+                // 大龙相关 演出列表
+                redisUtil.del(KylinRedisConst.PERFORMANCES_LIST_CITYNAME  + vo.getCityName());
+                redisUtil.del(KylinRedisConst.PERFORMANCES_LIST_RECOMMEND);
+                redisUtil.del(KylinRedisConst.PERFORMANCES_ROADLIST + vo.getRoadShowId());
             } catch (Exception e) {
                 e.printStackTrace();
             }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/docu/mongo_db_ddl.sql

+use test_ln_scene;
+#创建集合
+db.createCollection("AdamUserInfoVo");
+db.createCollection("AdamRealInfoVo");
+db.createCollection("AdamThirdPartInfoVo");
+db.createCollection("AdamUserMemberVo");
+db.createCollection("AdamMemberVo");
+
+#创建索引
+db.AdamUserInfoVo.createIndex({uid:"hashed"});
+db.AdamUserInfoVo.createIndex({state:"hashed"});
+db.AdamRealInfoVo.createIndex({uid:"hashed"});
+db.AdamRealInfoVo.createIndex({state:"hashed"});
+db.AdamThirdPartInfoVo.createIndex({uid:"hashed"});
+db.AdamThirdPartInfoVo.createIndex({state:"hashed"});
+db.AdamUserMemberVo.createIndex({uid:"hashed"});
+db.AdamMemberVo.createIndex({memberId:"hashed"});
+
+
+#创建分片
+sh.enableSharding("test_ln_scene");
+
+sh.shardCollection("test_ln_scene.AdamUserInfoVo",{"uid":"hashed"});
+sh.shardCollection("test_ln_scene.AdamRealInfoVo",{"uid":"hashed"});
+sh.shardCollection("test_ln_scene.AdamThirdPartInfoVo",{"uid":"hashed"});
+sh.shardCollection("test_ln_scene.AdamUserMemberVo",{"uid":"hashed"});
+sh.shardCollection("test_ln_scene.AdamMemberVo",{"memberId":"hashed"});
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-consumer/src/main/resources/bootstrap-test.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.207.177:7001,172.17.121.158:7001,172.17.121.157:7001
+    host: 172.17.207.177:7001
 # end-test-这里是配置信息基本值
 
 spring:

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

@@ -51,9 +51,9 @@ public class DataImpl {
     public boolean performance() {
         try {
             String driverClassName = "com.mysql.cj.jdbc.Driver";    //启动驱动
-            String url = "jdbc:mysql://39.106.122.201:3308/testmall";    //设置连接路径
-            String username = "testmall";    //数据库用户名
-            String password = "zhengzai!mYT";    //数据库连接密码
+            String url = "jdbc:mysql://zhengzai.mysql.polardb.rds.aliyuncs.com:3306/mall";    //设置连接路径
+            String username = "readonly";    //数据库用户名
+            String password = "ZWDsf8Fy";    //数据库连接密码
             Connection con = null;        //连接
             PreparedStatement pstmt = null;    //使用预编译语句
             ResultSet rs = null;    //获取的结果集
@@ -74,12 +74,12 @@ public class DataImpl {
             KylinTicketPartnerVo ticketPartnerVo = new KylinTicketPartnerVo();
 
             int count = 100;
-            int page = 0;
+            int page = 4;
 
             try {
                 Class.forName(driverClassName); //执行驱动
                 con = DriverManager.getConnection(url, username, password); //获取连接
-                String sqlAllCount = "select count(0) as 'allCount' from performances where status >= 3"; //设置的预编译语句格式
+                String sqlAllCount = "select count(0) as 'allCount' from performances where status >= 3 and created_at > '2021-01-01 00:00:01'"; //设置的预编译语句格式
                 pstmt = con.prepareStatement(sqlAllCount);
                 ResultSet allCount = pstmt.executeQuery();
                 ArrayList<String> performanceIds = new ArrayList<>();
@@ -91,7 +91,7 @@ public class DataImpl {
                 }
 
                 do {
-                    String sql = "select * from performances where status >= 3 limit " + count * page + " ," + count; //设置的预编译语句格式
+                    String sql = "select * from performances where status >= 3 and created_at > '2021-01-01 00:00:01' limit " + count * page + " ," + count; //设置的预编译语句格式
                     pstmt = con.prepareStatement(sql);
                     ResultSet resultData = pstmt.executeQuery();
                     int performanceId = 0;
@@ -116,10 +116,12 @@ public class DataImpl {
                         performances.setMobile(resultData.getString("mobile"));
                         performances.setDescribes(resultData.getString("describe"));
                         performances.setDetails(resultData.getString("detail"));
-                        performances.setNoticeImage("[{\"id\":1,\"sort\":1,\"text\":\"因演出票品非普通商品，其背后承载的文化服务具有时效性、稀缺性等特征，故不适用7天无理由退货政策。因“不可抗力”导致的演出取消或延期除外。\",\"title\":\"门票退换\",\"type\":\"image\",\"url\":\"http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/01/21/5c45722882a13.png\"},{\"id\":7,\"sort\":2,\"text\":\"凭订单二维码或手机号兑票入场，二维码或手机号请勿泄露，以免影响入场。个人原因导致的信息泄露，主办方/平台方不承担任何责任。\",\"title\":\"电子票\",\"type\":\"image\",\"url\":\"http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/01/21/5c456d9482fb9.png\"},{\"id\":3,\"sort\":3,\"text\":\"本场演出不设座位，均为站席观演。\",\"title\":\"仅设站席\",\"type\":\"image\",\"url\":\"http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/01/21/5c456e93db0b9.png\"},{\"id\":12,\"sort\":4,\"text\":\"每场现场票数量由场地方决定，具体请到现场询问。\",\"title\":\"现场票\",\"type\":\"image\",\"url\":\"http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/06/17/5d07647eaa55f.png\"}]");
+                        performances.setNoticeImage("[{\"id\":1,\"sort\":1,\"message\":\"因演出票品非普通商品，其背后承载的文化服务具有时效性、稀缺性等特征，故不适用7天无理由退货政策。因“不可抗力”导致的演出取消或延期除外。\",\"title\":\"门票退换\",\"type\":\"image\",\"imgUrl\":\"http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/01/21/5c45722882a13.png\"},{\"id\":7,\"sort\":2,\"message\":\"凭订单二维码或手机号兑票入场，二维码或手机号请勿泄露，以免影响入场。个人原因导致的信息泄露，主办方/平台方不承担任何责任。\",\"title\":\"电子票\",\"type\":\"image\",\"imgUrl\":\"http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/01/21/5c456d9482fb9.png\"},{\"id\":3,\"sort\":3,\"message\":\"本场演出不设座位，均为站席观演。\",\"title\":\"仅设站席\",\"type\":\"image\",\"imgUrl\":\"http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/01/21/5c456e93db0b9.png\"},{\"id\":12,\"sort\":4,\"message\":\"每场现场票数量由场地方决定，具体请到现场询问。\",\"title\":\"现场票\",\"type\":\"image\",\"imgUrl\":\"http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/06/17/5d07647eaa55f.png\"}]");
                         performances.setTimeStart(DateUtil.Formatter.yyyyMMddHHmmssS.parse(resultData.getTimestamp("time_start").toString()));
                         performances.setTimeEnd(DateUtil.Formatter.yyyyMMddHHmmssS.parse(resultData.getTimestamp("time_end").toString()));
-                        performances.setAuditTime(DateUtil.Formatter.yyyyMMddHHmmss.parse(resultData.getString("audit_submit_time")));
+                        if(null!=resultData.getString("audit_submit_time")) {
+                            performances.setAuditTime(DateUtil.Formatter.yyyyMMddHHmmss.parse(resultData.getString("audit_submit_time")));
+                        }
                         performances.setRejectTxt(resultData.getString("reject_text"));
                         performances.setSort(resultData.getInt("sort"));
                         performances.setComment("");
@@ -283,7 +285,9 @@ public class DataImpl {
                             tickets.setAdvanceMinuteMember(5);
                             tickets.setTimeStart(DateUtil.Formatter.yyyyMMddHHmmssS.parse(ticketData.getTimestamp("time_start").toString()));
                             tickets.setTimeEnd(DateUtil.Formatter.yyyyMMddHHmmssS.parse(ticketData.getTimestamp("time_end").toString()));
-                            tickets.setTimeEndExpress(DateUtil.Formatter.yyyyMMddHHmmssS.parse(ticketData.getTimestamp("time_end_express").toString()));
+                            if(null!=ticketData.getTimestamp("time_end_express")) {
+                                tickets.setTimeEndExpress(DateUtil.Formatter.yyyyMMddHHmmssS.parse(ticketData.getTimestamp("time_end_express").toString()));
+                            }
                             tickets.setUseStart(DateUtil.Formatter.yyyyMMddHHmmssS.parse(ticketData.getTimestamp("use_start").toString()));
                             tickets.setUseEnd(DateUtil.Formatter.yyyyMMddHHmmssS.parse(ticketData.getTimestamp("use_end").toString()));
                             tickets.setPayCountdownMinute(5);
@@ -383,12 +387,12 @@ public class DataImpl {
 
                     resultData.last();
                     rowCount += resultData.getRow();
-                    if (allCountResult > rowCount) {
-                        isBreak = true;
-                        page+=1;
-                    } else {
-                        isBreak = false;
-                    }
+//                    if (allCountResult > rowCount) {
+//                        isBreak = true;
+//                        page+=1;
+//                    } else {
+//                        isBreak = false;
+//                    }
                 } while (isBreak);
                 return true;
             } catch (Exception e) {

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

@@ -119,10 +119,10 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
             kylinTicketPartnerVo.setStatus(0);
             kylinTicketPartnerVo.setDefault();
             if(ticketCreateParam.getIsExpress()==1){
-                kylinTicketPartnerVo.setDescribesExpress(ticketCreateParam.getExpressDescribes());
+                kylinTicketPartnerVo.setDescribesExpress(ticketCreateParam.getDescribesExpress());
             }
             if(ticketCreateParam.getIsElectronic()==1){
-                kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getElectronicDescribe());
+                kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic());
             }
 
             if (ticketCreateParam.getIsExpress() == 1) {
@@ -165,10 +165,10 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
             kylinTicketPartnerVo.setUseEnd(kylinTicketTimesPartnerVo.getUseEnd());
             kylinTicketPartnerVo.setType(kylinTicketTimesPartnerVo.getType());
             if(ticketCreateParam.getIsExpress()==1){
-                kylinTicketPartnerVo.setDescribesExpress(ticketCreateParam.getExpressDescribes());
+                kylinTicketPartnerVo.setDescribesExpress(ticketCreateParam.getDescribesExpress());
             }
             if(ticketCreateParam.getIsElectronic()==1){
-                kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getElectronicDescribe());
+                kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic());
             }
             kylinTicketPartnerVo.setStatus(-2);
             kylinTicketPartnerVo.setDefault();
@@ -214,10 +214,10 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
             kylinTicketPartnerVo.setTimesId(null);
             kylinTicketPartnerVo.setStatus(null);
             if(ticketCreateParam.getIsExpress()==1){
-                kylinTicketPartnerVo.setDescribesExpress(ticketCreateParam.getExpressDescribes());
+                kylinTicketPartnerVo.setDescribesExpress(ticketCreateParam.getDescribesExpress());
             }
             if(ticketCreateParam.getIsElectronic()==1){
-                kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getElectronicDescribe());
+                kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic());
             }
 
             kylinTicketPartnerVo.setDefault();

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

@@ -386,6 +386,9 @@ public class DataUtils {
                         redisUtil.incr(performanceIdKey, buyCount);
                         break;
                     }
+                    if(null==redisUtil.get(redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + item)){
+                        redisUtil.set(redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + item,0);
+                    }
                     if (i == 0) {
                         count = (int) redisUtil.get(redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + item);
                     } else {
@@ -408,6 +411,9 @@ public class DataUtils {
                         redisUtil.decr(performanceIdKey, Math.abs(buyCount));
                         break;
                     }
+                    if(null==redisUtil.get(redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + item)){
+                        redisUtil.set(redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + item,0);
+                    }
                     if (i == 0) {
                         count = (int) redisUtil.get(redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + item);
                     } else {

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/sqlmap.properties

@@ -10,22 +10,22 @@ kylin_order_ticket_status.add=INSERT INTO kylin_order_ticket_status(order_ticket
 kylin_order_ticket_entities.add=INSERT INTO kylin_order_ticket_entities(order_ticket_entities_id ,order_id ,ticket_id ,user_id ,time_id ,performance_id ,enter_type ,enter_name ,enter_mobile,enter_id_code,`status`,sys_damai,check_client,is_payment,`comment`,created_at,updated_at)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 
 # ------------------------再次支付----------------------------
-kylin_order_ticket.payAgain=UPDATE kylin_order_tickets SET order_code = ? , updated_at = ?  WHERE order_tickets_id = ? and (updated_at = ? or created_at = ?)
-kylin_order_ticket_status.payAgain=UPDATE kylin_order_ticket_status SET updated_at = ?  WHERE order_id = ? and (updated_at = ? or created_at = ?)
-kylin_order_ticket_relation.payAgain=UPDATE kylin_order_ticket_relations SET updated_at = ?  WHERE order_id = ? and (updated_at = ? or created_at = ?)
+kylin_order_ticket.payAgain=UPDATE kylin_order_tickets SET order_code = ? , updated_at = ?  WHERE order_tickets_id = ? and (updated_at <= ? or created_at = ?)
+kylin_order_ticket_status.payAgain=UPDATE kylin_order_ticket_status SET updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ?)
+kylin_order_ticket_relation.payAgain=UPDATE kylin_order_ticket_relations SET updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ?)
 
 
 # ------------------------支付回调----------------------------
-kylin_order_ticket.synPay=UPDATE  kylin_order_tickets SET payment_type = ? ,pay_code = ? , time_pay = ?, qr_code = ? , updated_at = ? WHERE order_tickets_id = ? and (updated_at = ? or created_at = ?)
-kylin_order_ticket_status.synPay=UPDATE kylin_order_ticket_status SET `status` = ?,pay_status = ?,updated_at = ? WHERE order_id = ? and (updated_at = ? or created_at = ?)
-kylin_order_ticket_relation.synPay=UPDATE kylin_order_ticket_relations SET updated_at = ? WHERE order_id = ? and (updated_at = ? or created_at = ?)
-kylin_order_ticket_entities.synPay=UPDATE kylin_order_ticket_entities SET is_payment = ?,updated_at = ?,sys_damai = 1 WHERE order_id = ? and (updated_at = ? or created_at = ?)
+kylin_order_ticket.synPay=UPDATE  kylin_order_tickets SET payment_type = ? ,pay_code = ? , time_pay = ?, qr_code = ? , updated_at = ? WHERE order_tickets_id = ? and (updated_at <= ? or created_at = ?)
+kylin_order_ticket_status.synPay=UPDATE kylin_order_ticket_status SET `status` = ?,pay_status = ?,updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ?)
+kylin_order_ticket_relation.synPay=UPDATE kylin_order_ticket_relations SET updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ?)
+kylin_order_ticket_entities.synPay=UPDATE kylin_order_ticket_entities SET is_payment = ?,updated_at = ?,sys_damai = 1 WHERE order_id = ? and (updated_at <= ? or created_at = ?)
 
 
 
 # ------------------------订单关闭----------------------------
-kylin_order_ticket.close=UPDATE kylin_order_tickets SET updated_at = ? WHERE order_tickets_id = ? and (updated_at = ? or created_at = ?)
-kylin_order_ticket_status.close=UPDATE kylin_order_ticket_status SET `status` = ?,updated_at = ? WHERE order_id = ? and (updated_at = ? or created_at = ?)
-kylin_order_ticket_relation.close=UPDATE kylin_order_ticket_relations SET updated_at = ? WHERE order_id = ? and (updated_at = ? or created_at = ?)
+kylin_order_ticket.close=UPDATE kylin_order_tickets SET updated_at = ? WHERE order_tickets_id = ? and (updated_at <= ? or created_at = ?)
+kylin_order_ticket_status.close=UPDATE kylin_order_ticket_status SET `status` = ?,updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ?)
+kylin_order_ticket_relation.close=UPDATE kylin_order_ticket_relations SET updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ?)