Merge branch 'dev' into test

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

@@ -285,9 +285,9 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
                 break;
             case "reject":
                 boolean cancelRes = kylinRefundsStatusServiceImpl.orderTicketRefundCancel(refundList, false);
-                if (cancelRes) {
-                    res = kylinRefundsStatusServiceImpl.orderRefundChangeStatus(refundList, type, reject, "");
-                }
+                log.info("取消处理" + cancelRes);
+                log.info("取消处理ing");
+                res = kylinRefundsStatusServiceImpl.orderRefundChangeStatus(refundList, type, reject, "");
                 break;
             case "unfilled":
                 res = kylinRefundsStatusServiceImpl.orderTicketRefundUnfilled(refundList, refuse);
@@ -380,7 +380,8 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
         KylinOrderRefundPic kylinOrderRefundPic = kylinOrderRefundPicMapper.selectOne(new UpdateWrapper<KylinOrderRefundPic>().eq("order_refunds_id", orderRefundId));
         if (kylinOrderRefundPic != null) {
             String picStr = kylinOrderRefundPic.getPicUrl();
-            List<String> strList = JsonUtils.fromJson(picStr, new TypeReference<List<String>>() {});
+            List<String> strList = JsonUtils.fromJson(picStr, new TypeReference<List<String>>() {
+            });
             kylinOrderRefundsVo.setPicList(strList);
         }
 
@@ -473,20 +474,20 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
     }
 
     @Override
-    public String getOrderRefundCode(String code,int type) {
+    public String getOrderRefundCode(String code, int type) {
         String orderCode = null;
-        if(type==1){
-            KylinOrderRefunds data = kylinOrderRefundsMapper.selectOne(new UpdateWrapper<KylinOrderRefunds>().like("order_refund_code",code));
-            if(data==null){
+        if (type == 1) {
+            KylinOrderRefunds data = kylinOrderRefundsMapper.selectOne(new UpdateWrapper<KylinOrderRefunds>().like("order_refund_code", code));
+            if (data == null) {
                 return null;
-            }else{
+            } else {
                 orderCode = data.getOrderRefundCode();
             }
-        }else if(type==2){
-            KylinOrderTickets data = kylinOrderTicketsMapper.selectOne(new UpdateWrapper<KylinOrderTickets>().like("order_code",code));
-            if(data==null){
+        } else if (type == 2) {
+            KylinOrderTickets data = kylinOrderTicketsMapper.selectOne(new UpdateWrapper<KylinOrderTickets>().like("order_code", code));
+            if (data == null) {
                 return null;
-            }else{
+            } else {
                 orderCode = data.getOrderCode();
             }
         }

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

@@ -334,6 +334,7 @@ public class KylinRefundsStatusServiceImpl {
     }
 
     public boolean orderRefundChangeStatus(List<KylinOrderRefunds> refundList, String type, String reject, String refuse) {
+        log.info("orderRefundChangeStatus ----- in");
         String authId = ShiroUtils.getUserId().toString();
         String authName = ShiroUtils.getLoginName();
         KylinOrderRefunds kylinOrderRefunds = new KylinOrderRefunds();

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

@@ -21,6 +21,7 @@ import com.liquidnet.service.kylin.mapper.*;
 import com.mongodb.BasicDBObject;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Criteria;
@@ -310,6 +311,14 @@ public class PerformanceVoUtils {
 
                 //修改票
                 List<KylinTicketPartnerVo> kylinTicketPartnerVoList = getTicketMongoList(ticketTimeItem.getTicketTimesId());
+                int isMember = 0;
+                for (KylinTicketPartnerVo ticketItem : kylinTicketPartnerVoList) {
+                    if (ticketItem.getIsMember().equals(1)) {
+                        isMember = 1;
+                    }
+                }
+
+
                 for (KylinTicketPartnerVo ticketItem : kylinTicketPartnerVoList) {
                     KylinTicketPartnerVo kylinTicketPartnerVo;
                     kylinTicketPartnerVo = mongoTemplate.findOne(
@@ -355,7 +364,7 @@ public class PerformanceVoUtils {
                     if (ticketItem.getStatus() == -2) {
                         KylinTicketPartnerVo item = kylinTicketPartnerVoList.get(0);
                         tickets.setAdvanceMinuteMember(5);
-                        ticketStatus.setIsMember(item.getIsMember());
+                        ticketStatus.setIsMember(isMember);
                         ticketStatus.setMemberLimitCount(1);
                         ticketRelations.setCreatedAt(LocalDateTime.now());
                         tickets.setCreatedAt(LocalDateTime.now());
@@ -408,7 +417,7 @@ public class PerformanceVoUtils {
     }
 
     public List<KylinTicketTimesPartnerVo> getTimesMongoList(String performancesId) {
-        return mongoTemplate.find(Query.query(Criteria.where("performancesId").is(performancesId)), KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName());
+        return mongoTemplate.find(Query.query(Criteria.where("performancesId").is(performancesId)).with(Sort.by(Sort.Direction.DESC,"createdAt")), KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName());
     }
 
 }