overtime

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/refund/OrderRefundsCallbackServiceImpl.java

@@ -54,6 +54,10 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
     private String platformUrl;
     @Value("${liquidnet.client.admin.phpPayUrl}")
     private String phpPayUrl;
+    @Value("${liquidnet.url-refund.apply}")
+    private String applyUrl;
+    @Value("${liquidnet.url-refund.notify}")
+    private String notifyUrl;
 
     @Autowired
     private KylinRefundsStatusServiceImpl kylinRefundsStatusServiceImpl;
@@ -189,29 +193,44 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
             LocalDateTime nowTime = LocalDateTime.now();
             KylinOrderRefunds kylinOrderRefunds = KylinOrderRefunds.getNew();
             // 运营审核
-            kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED);
+            // kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED);
             kylinOrderRefunds.setAuditorId("system");
             kylinOrderRefunds.setAuditorName("system");
             kylinOrderRefunds.setAuditorAt(nowTime);
             kylinOrderRefunds.setReject("系统审核通过");
-            kylinOrderRefunds.setUpdatedAt(nowTime);
             // 财务审核
             kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_UNFILLED);
             kylinOrderRefunds.setExecutorId("system");
             kylinOrderRefunds.setExecutorName("system");
             kylinOrderRefunds.setExecutorAt(nowTime);
             kylinOrderRefunds.setRefuse("系统审核通过");
+            kylinOrderRefunds.setUpdatedAt(nowTime);
+            // 数据库
+            kylinOrderRefundsMapper.update(
+                    kylinOrderRefunds,
+                    Wrappers.lambdaUpdate(KylinOrderRefunds.class).eq(KylinOrderRefunds::getOrderRefundsId, refundId)
+            );
+            // 缓存
+            KylinOrderRefundsVo kylinOrderRefundsVo = KylinOrderRefundsVo.getNew();
+            BeanUtils.copyProperties(kylinOrderRefunds, kylinOrderRefundsVo);
+            UpdateResult result = mongoTemplate.updateFirst(
+                    Query.query(Criteria.where("orderRefundsId").is(refundId)),
+                    Update.fromDocument(Document.parse(JsonUtils.toJson(kylinOrderRefundsVo))),
+                    KylinOrderRefundsVo.class, KylinOrderRefundsVo.class.getSimpleName()
+            );
+            dataUtils.delOrderRefundVo(refundId);
+            dataUtils.delOrderRefundVoByOrderId(orderId);
 
             KylinOrderTickets oderInfo = kylinOrderTicketsMapper.selectOne(
                     Wrappers.lambdaQuery(KylinOrderTickets.class)
                             .eq(KylinOrderTickets::getOrderTicketsId, orderId)
             );
-            BigDecimal refundPrice = refund.getPrice().add(refund.getPriceExpress());
+            BigDecimal refundPrice = refundInfo.getPrice().add(refundInfo.getPriceExpress());
             MultiValueMap<String, String> params = new LinkedMultiValueMap();
             params.add("code", oderInfo.getPayCode());
             params.add("notifyUrl", notifyUrl);
             params.add("orderCode", oderInfo.getOrderCode());
-            params.add("orderRefundCode", refund.getOrderRefundCode());
+            params.add("orderRefundCode", refundInfo.getOrderRefundCode());
             params.add("paymentId", oderInfo.getPaymentId());
             params.add("paymentType", oderInfo.getPaymentType());
             params.add("price", String.valueOf(refundPrice));
@@ -219,7 +238,6 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
             params.add("reason", "按需退款");
 
             MultiValueMap<String, String> headers = new LinkedMultiValueMap();
-            // headers.add("Content-Type", "application/json;charset=UTF-8");
             headers.add("Accept", "application/json;charset=UTF-8");
             log.info("退款参数" + JsonUtils.toJson(params));
             // 请求pay
@@ -239,14 +257,14 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
                     kylinOrderRefundsFail.setUpdatedAt(LocalDateTime.now());
                     kylinOrderRefundsMapper.update(
                             kylinOrderRefundsFail,
-                            new UpdateWrapper<KylinOrderRefunds>().eq("order_refunds_id", refund.getOrderRefundsId())
+                            Wrappers.lambdaUpdate(KylinOrderRefunds.class).eq(KylinOrderRefunds::getOrderRefundsId, refundId)
                     );
                     // 修改缓存
                     KylinOrderRefundsVo kylinOrderRefundsVoFail = new KylinOrderRefundsVo();
                     BeanUtils.copyProperties(kylinOrderRefundsFail, kylinOrderRefundsVoFail);
                     BasicDBObject objectFail = new BasicDBObject("$set", mongoConverter.convertToMongoType(kylinOrderRefundsVoFail));
                     UpdateResult updateFailResult = mongoTemplate.getCollection(KylinOrderRefundsVo.class.getSimpleName()).updateOne(
-                            Query.query(Criteria.where("orderRefundsId").is(refund.getOrderRefundsId())).getQueryObject(),
+                            Query.query(Criteria.where("orderRefundsId").is(refundId)).getQueryObject(),
                             objectFail
                     );
 //                    List<String> strings = Arrays.asList(refund.getOrderRefundsId());
@@ -255,37 +273,11 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
 //                    dataUtils.delOrderRefundVoByOrderId(strings1);
 
                     continue;
-                }else{
-                    //TODO 秀龙 大麦退款
-                    for (KylinOrderRefunds item : refundList) {
-                        KylinOrderTicketVo orderData = dataUtils.getOrderTicketVo(item.getOrderTicketsId());
-                        KylinPerformanceVo vo = dataUtils.getPerformanceVo(orderData.getPerformanceId());
-                        taobaoTicketUtils.refundDamaiOrder(orderData,vo);
-                    }
                 }
             } catch (Exception e) {
                 log.info("退款请求pay失败e" + e.getMessage());
                 continue;
             }
-
-
-
-            // 数据库
-            kylinOrderRefundsMapper.update(
-                    kylinOrderRefunds,
-                    Wrappers.lambdaUpdate(KylinOrderRefunds.class).eq(KylinOrderRefunds::getOrderRefundsId, refundId)
-            );
-            // 缓存
-            KylinOrderRefundsVo kylinOrderRefundsVo = KylinOrderRefundsVo.getNew();
-            BeanUtils.copyProperties(kylinOrderRefunds, kylinOrderRefundsVo);
-            UpdateResult result = mongoTemplate.updateFirst(
-                    Query.query(Criteria.where("orderRefundsId").is(refundId)),
-                    Update.fromDocument(Document.parse(JsonUtils.toJson(kylinOrderRefundsVo))),
-                    KylinOrderRefundsVo.class, KylinOrderRefundsVo.class.getSimpleName()
-            );
-            dataUtils.delOrderRefundVo(refundId);
-            dataUtils.delOrderRefundVoByOrderId(orderId);
-
         }
         return "success";
     }