提交 二维码

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

@@ -115,7 +115,14 @@ public class KylinOrderTicketsController {
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public ResponseDto<OrderRefundVo> orderRefundDetails(@RequestParam(value = "orderId", required = true) @NotNull(message = "订单id不能为空") String orderId,
                                                          @RequestParam(value = "orderRefundId", required = true) @NotNull(message = "退款订单id不能为空") String orderRefundId) {
-        return ResponseDto.success(orderTicketsService.orderRefundDetails(orderId,orderRefundId));
+        return ResponseDto.success(orderTicketsService.orderRefundDetails(orderId, orderRefundId));
+    }
+
+    @PostMapping("sendOrderRefund")
+    @ApiOperation("发起退款申请")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<Boolean> orderRefundWithdraw(@RequestParam(value = "orderRefundId", required = true) @NotNull(message = "退款订单id不能为空") String orderRefundId) {
+        return orderTicketsService.orderRefundWithdraw(orderRefundId) == null ? ResponseDto.failure() : ResponseDto.success();
     }
 
 

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

@@ -990,7 +990,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 orderTicketVo.setFieldName(performanceVo.getFieldName());
                 if (ticketVo.getIsShowCode() == 1) {
                     Date date = DateUtil.parse(ticketVo.getQrCodeShowTime(), DateUtil.Formatter.yyyyMMddHHmmss.toString());
-                    if (DateUtil.compareDay(DateUtil.now(), date) <= 0) {
+                    if (DateUtil.now().compareTo(date)>= 0) {
                         orderTicketVo.setQrCode(orderTicketVo.getQrCode());
                     } else {
                         orderTicketVo.setQrCode("");
@@ -1032,7 +1032,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                     vo.setKuaidi_status(-2);
                 }
 
-                if (null!=performanceVo.getIsCanRefund() && performanceVo.getIsCanRefund() == 1) {
+                if (null != performanceVo.getIsCanRefund() && performanceVo.getIsCanRefund() == 1) {
                     Date refundOpenDate = DateUtil.parse(performanceVo.getRefundOpenTime(), "yyyy-MM-dd HH:mm:ss");
                     Date refundCloseDate = DateUtil.parse(performanceVo.getRefundCloseTime(), "yyyy-MM-dd HH:mm:ss");
                     if (DateUtil.compareDay(nowDate, refundCloseDate) < 0 && DateUtil.compareDay(nowDate, refundOpenDate) > 0) {
@@ -1283,6 +1283,14 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
     @Override
     public Boolean orderRefundWithdraw(String orderRefundsId) {
 
+        LinkedList<String> sqls = new LinkedList<>();
+        LinkedList<Object[]> sqlsDataA = new LinkedList<>();
+        LinkedList<Object[]> sqlsDataB = new LinkedList<>();
+        LinkedList<Object[]> sqlsDataC = new LinkedList<>();
+
+        LocalDateTime time = LocalDateTime.now();
+        String strTime = DateUtil.Formatter.yyyyMMddHHmmss.format(time);
+        try {
             KylinOrderRefundsVoBase orderRefundsVo = dataUtils.getOrderRefundVo(orderRefundsId);
             List<KylinOrderRefundEntitiesVo> refundEntities = orderRefundsVo.getOrderRefundEntitiesVoList();
             String orderTicketsId = orderRefundsVo.getOrderTicketsId();
@@ -1314,11 +1322,15 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
 
             KylinOrderTicketStatus orderStatusTable = new KylinOrderTicketStatus();
             orderStatusTable.setStatus(newStatus);
-//        kylinOrderTicketStatusMapper.update(orderStatusTable, new UpdateWrapper<KylinOrderTicketStatus>()
-//                .eq("order_id", orderTicketsId));
+            orderStatusTable.setUpdatedAt(time);
+            sqlsDataA.add(new Object[]{
+                    orderStatusTable.getStatus(), orderStatusTable.getUpdatedAt(), orderTicketsId, orderTicketVo.getChangeDate(), orderTicketVo.getChangeDate()
+            });
 
             KylinOrderTicketVo kylinOrderTicketVo = new KylinOrderTicketVo();
             kylinOrderTicketVo.setStatus(newStatus);
+            kylinOrderTicketVo.setUpdatedAt(strTime);
+            kylinOrderTicketVo.setChangeDate(time);
             BasicDBObject orderObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketVo)));
             mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne(
                     Query.query(Criteria.where("orderTicketsId").is(orderTicketsId)).getQueryObject(),
@@ -1332,20 +1344,20 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 // 订单状态表 判断是退到正在退款 已付款 部分退款？(取消，完成，失败)
                 int newIsPayment = 0;
                 int refundingEntitiesCount = 0;
-            for (KylinOrderRefundsVoBase item2 :orderRefundsVoList) {
+                for (KylinOrderRefundsVoBase item2 : orderRefundsVoList) {
                     int status = item2.getStatus();
-                if(!item2.getOrderRefundsId().equals(orderRefundsId) && (status != 2 && status != 4 && status != 6)){
-                    for(KylinOrderRefundEntitiesVo item3: item2.getOrderRefundEntitiesVoList()){
-                        if(item3.getOrderTicketEntitiesId().equals(item.getOrderTicketEntitiesId())){
-                            refundingEntitiesCount+=1;
+                    if (!item2.getOrderRefundsId().equals(orderRefundsId) && (status != 2 && status != 4 && status != 6)) {
+                        for (KylinOrderRefundEntitiesVo item3 : item2.getOrderRefundEntitiesVoList()) {
+                            if (item3.getOrderTicketEntitiesId().equals(item.getOrderTicketEntitiesId())) {
+                                refundingEntitiesCount += 1;
                             }
                         }
                     }
                 }
+                KylinOrderTicketEntitiesVo entitiesVo = null;
                 if (refundingEntitiesCount > 0) { // 存在其他正在退款的该入场人订单
                     newIsPayment = KylinTableStatusConst.ENTITIES_IS_PAYMENT2;
                 } else {
-                KylinOrderTicketEntitiesVo entitiesVo = null;
                     for (KylinOrderTicketEntitiesVo entitiesVo1 : orderTicketVo.getEntitiesVoList()) {
                         if (entitiesVo1.getOrderTicketEntitiesId().equals(item.getOrderTicketEntitiesId())) {
                             entitiesVo = entitiesVo1;
@@ -1360,13 +1372,16 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 }
                 KylinOrderTicketEntities entitiesTable = new KylinOrderTicketEntities();
                 entitiesTable.setIsPayment(newIsPayment);
-//            kylinOrderTicketEntitiesMapper.update(entitiesTable, new UpdateWrapper<KylinOrderTicketEntities>()
-//                    .eq("order_ticket_entities_id", entitiesId)
-//                    .eq("is_payment", KylinTableStatusConst.ENTITIES_IS_PAYMENT2)
-//            );
+                entitiesTable.setUpdatedAt(time);
+
+                sqlsDataB.add(new Object[]{
+                        entitiesTable.getIsPayment(), entitiesTable.getUpdatedAt(), item.getOrderTicketEntitiesId(), entitiesVo.getChangeDate(), entitiesVo.getChangeDate()
+                });
 
                 KylinOrderTicketEntitiesVo kylinOrderTicketEntitiesVo = new KylinOrderTicketEntitiesVo();
                 kylinOrderTicketEntitiesVo.setIsPayment(newIsPayment);
+                kylinOrderTicketEntitiesVo.setUpdatedAt(strTime);
+                kylinOrderTicketEntitiesVo.setChangeDate(time);
                 BasicDBObject entitiesObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketEntitiesVo)));
                 mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).updateOne(
                         Query.query(Criteria.where("orderTicketEntitiesId").is(item.getOrderTicketEntitiesId())).getQueryObject(),
@@ -1380,10 +1395,32 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             KylinOrderRefunds kylinOrderRefunds = new KylinOrderRefunds();
             kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL);
             kylinOrderRefunds.setUpdatedAt(LocalDateTime.now());
-//        kylinOrderRefundsMapper.update(kylinOrderRefunds, new UpdateWrapper<KylinOrderRefunds>()
-//                .eq("order_refunds_id", orderRefundsId));
 
-        return null;
+            KylinOrderRefundsVoBase orderRefundsVoBase = new KylinOrderRefundsVoBase();
+            orderRefundsVoBase.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL);
+            orderRefundsVoBase.setUpdatedAt(strTime);
+            BasicDBObject refundObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(orderRefundsVoBase)));
+            mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne(
+                    Query.query(Criteria.where("orderRefundsId").is(orderRefundsId)).getQueryObject(),
+                    refundObject
+            );
+
+            sqlsDataC.add(new Object[]{
+                    orderRefundsVoBase.getStatus(), orderRefundsVoBase.getUpdatedAt(), orderRefundsId
+            });
+
+            sqls.add(SqlMapping.get("kylin_order_ticket_status.withDraw"));
+            sqls.add(SqlMapping.get("kylin_order_ticket_entities.withDraw"));
+            sqls.add(SqlMapping.get("kylin_order_refund.withDraw"));
+
+            //TODO 生成新QUERY
+            rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_PAY, MQConst.ROUTING_KEY_SQL_ORDER_PAY,
+                    SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC));
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
     }
 
     @Override

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

@@ -464,6 +464,7 @@ public class KylinRefundsStatusServiceImpl {
                     orderRefundPic.getOrderRefundsId(), orderRefundPic.getOrderRefundsId(), orderRefundPic.getPicUrl(), orderRefundPic.getCreatedAt()
             });
 
+            //TODO 生成新QUERY
             rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_PAY, MQConst.ROUTING_KEY_SQL_ORDER_PAY,
                     SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC, sqlsDataD, sqlsDataE));
 

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

@@ -40,5 +40,9 @@ kylin_order_refund_entities.refund=INSERT INTO kylin_order_refund_entities (orde
 kylin_order_refund_pic.refund=INSERT INTO kylin_order_refund_pic (refund_pic_id,order_refunds_id,pic_url,created_at) VALUES (?,?,?,?)
 
 # ------------------------用户发起订单退款撤回----------------------------
+kylin_order_ticket_status.withDraw=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ?)
+kylin_order_ticket_entities.withDraw=UPDATE kylin_order_ticket_entities SET is_payment = ?,updated_at = ?,sys_damai = 1 WHERE order_id = ? and (updated_at <= ? or created_at = ?)
+kylin_order_refund.withDraw=UPDATE kylin_order_refunds SET status = ? ,updated_at = ?  WHERE order_refunds_id = ?
+
+
 
-# ------------------------用户发起订单退款----------------------------