Merge branch 'jxl_1019_refund' into pre

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

@@ -406,9 +406,23 @@ public class KylinRefundsStatusServiceImpl {
         kylinOrderRefunds.setExecutorName(authName);
         kylinOrderRefunds.setExecutorAt(LocalDateTime.now());
         kylinOrderRefunds.setRefuse(refundApplyParam.getRefuse());
-        kylinOrderRefunds.setUpdatedAt(LocalDateTime.now());
 
         for (KylinOrderRefunds refund : refundList) {
+            // 更新退款表
+            kylinOrderRefunds.setUpdatedAt(LocalDateTime.now());
+            kylinOrderRefundsMapper.update(
+                    kylinOrderRefunds,
+                    new UpdateWrapper<KylinOrderRefunds>().eq("order_refunds_id", refund.getOrderRefundsId())
+            );
+            // 修改缓存
+            KylinOrderRefundsVo kylinOrderRefundsVo = new KylinOrderRefundsVo();
+            BeanUtils.copyProperties(kylinOrderRefunds, kylinOrderRefundsVo);
+            BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(kylinOrderRefundsVo));
+            UpdateResult updateResult = mongoTemplate.getCollection(KylinOrderRefundsVo.class.getSimpleName()).updateOne(
+                    Query.query(Criteria.where("orderRefundsId").is(refund.getOrderRefundsId())).getQueryObject(),
+                    object
+            );
+
             KylinOrderTickets oderInfo = kylinOrderTicketsMapper.selectOne(
                     new QueryWrapper<KylinOrderTickets>()
                             .eq("order_tickets_id", refund.getOrderTicketsId())
@@ -426,7 +440,7 @@ public class KylinRefundsStatusServiceImpl {
             params.add("reason", "按需退款");
 
             MultiValueMap<String, String> headers = new LinkedMultiValueMap();
-//            headers.add("Content-Type", "application/json;charset=UTF-8");
+            // headers.add("Content-Type", "application/json;charset=UTF-8");
             headers.add("Accept", "application/json;charset=UTF-8");
             log.info("退款参数" + JsonUtils.toJson(params));
             // 请求pay
@@ -443,23 +457,23 @@ public class KylinRefundsStatusServiceImpl {
                     KylinOrderRefunds kylinOrderRefundsFail = new KylinOrderRefunds();
                     kylinOrderRefundsFail.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_ERROR);
                     kylinOrderRefundsFail.setRefundError(message);
-                    kylinOrderRefunds.setUpdatedAt(LocalDateTime.now());
+                    kylinOrderRefundsFail.setUpdatedAt(LocalDateTime.now());
                     kylinOrderRefundsMapper.update(
                             kylinOrderRefundsFail,
                             new UpdateWrapper<KylinOrderRefunds>().eq("order_refunds_id", refund.getOrderRefundsId())
                     );
                     // 修改缓存
-                    KylinOrderRefundsVo kylinOrderRefundsVo = new KylinOrderRefundsVo();
-                    BeanUtils.copyProperties(kylinOrderRefundsFail, kylinOrderRefundsVo);
-                    BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(kylinOrderRefundsVo));
-                    UpdateResult updateResult = mongoTemplate.getCollection(KylinOrderRefundsVo.class.getSimpleName()).updateOne(
+                    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(),
-                            object
+                            objectFail
                     );
-                    List<String> strings = Arrays.asList(refund.getOrderRefundsId());
-                    List<String> strings1 = Arrays.asList(refund.getOrderTicketsId());
-                    dataUtils.delOrderRefundVo(strings);
-                    dataUtils.delOrderRefundVoByOrderId(strings1);
+//                    List<String> strings = Arrays.asList(refund.getOrderRefundsId());
+//                    List<String> strings1 = Arrays.asList(refund.getOrderTicketsId());
+//                    dataUtils.delOrderRefundVo(strings);
+//                    dataUtils.delOrderRefundVoByOrderId(strings1);
 
                     continue;
                 }else{
@@ -474,19 +488,6 @@ public class KylinRefundsStatusServiceImpl {
                 log.info("退款请求pay失败e" + e.getMessage());
                 continue;
             }
-            // 更新退款表
-            kylinOrderRefundsMapper.update(
-                    kylinOrderRefunds,
-                    new UpdateWrapper<KylinOrderRefunds>().eq("order_refunds_id", refund.getOrderRefundsId())
-            );
-            // 修改缓存
-            KylinOrderRefundsVo kylinOrderRefundsVo = new KylinOrderRefundsVo();
-            BeanUtils.copyProperties(kylinOrderRefunds, kylinOrderRefundsVo);
-            BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(kylinOrderRefundsVo));
-            UpdateResult updateResult = mongoTemplate.getCollection(KylinOrderRefundsVo.class.getSimpleName()).updateOne(
-                    Query.query(Criteria.where("orderRefundsId").is(refund.getOrderRefundsId())).getQueryObject(),
-                    object
-            );
         }
 
         List<String> orderRefundIds = refundList.stream().map(