主动完成退款

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

@@ -184,7 +184,7 @@ public class KylinOrderRefundAdminController extends BaseController {
         }
     }
 
-    // 主动完成退款
+    // 主动完成退款 没有批量
     @RequiresPermissions("kylin:refund:completed")
     @PostMapping("completed")
     @ResponseBody

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

@@ -94,6 +94,7 @@
     var executeFlag = [[${@permission.hasPermi('kylin:refund:execute')}]];
     var cancelFlag = [[${@permission.hasPermi('kylin:refund:cancel')}]];
     var reapplyFlag = [[${@permission.hasPermi('kylin:refund:reapply')}]];
+    var completedFlag = [[${@permission.hasPermi('kylin:refund:completed')}]];
 
     var prefix = ctx + "kylin/refund";
 
@@ -189,6 +190,7 @@
             detailUrl: prefix + "/details/{id}",
             cancelUrl: prefix + "/cancel",
             reapplyUrl: prefix + "/reapply",
+            completedUrl: prefix + "/completed",
             modalName: "-订单退款",
             columns: [{
                 checkbox: true
@@ -236,6 +238,7 @@
                         actions.push('<a class="btn btn-primary btn-xs ' + executeFlag + '" href="javascript:void(0)" onclick="execute(\'' + row.orderRefundsId + '\')"></i>二审</a> ');
                         actions.push('<a class="btn btn-danger btn-xs ' + cancelFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderRefundsId + '\', \'确定取消退款申请吗？\', table.options.cancelUrl)"></i>取消</a> ');
                         actions.push('<a class="btn btn-warning btn-xs ' + reapplyFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderRefundsId + '\', \'确定重新提交退款审核吗？\', table.options.reapplyUrl)"></i>重新提交</a> ');
+                        actions.push('<a class="btn btn-warning btn-xs ' + completedFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderRefundsId + '\', \'确定主动完成退款吗？\', table.options.completedUrl)"></i>主动完成退款</a> ');
                         return actions.join('');
                     }
                 }]

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

@@ -7,6 +7,7 @@ import com.liquidnet.client.admin.common.utils.ShiroUtils;
 import com.liquidnet.client.admin.common.utils.StringUtils;
 import com.liquidnet.client.admin.zhengzai.kylin.utils.DataUtils;
 import com.liquidnet.client.admin.zhengzai.kylin.utils.MongoVoUtils;
+import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.HttpUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.JsonUtils;
@@ -20,11 +21,13 @@ import com.liquidnet.service.kylin.mapper.*;
 import com.mongodb.BasicDBObject;
 import com.mongodb.client.model.FindOneAndUpdateOptions;
 import com.mongodb.client.model.ReturnDocument;
+import com.mongodb.client.result.UpdateResult;
 import lombok.extern.slf4j.Slf4j;
 import org.bson.Document;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
@@ -33,6 +36,7 @@ import org.springframework.util.MultiValueMap;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -74,6 +78,9 @@ public class KylinRefundsStatusServiceImpl {
     @Autowired
     MongoTemplate mongoTemplate;
 
+    @Autowired
+    private MongoConverter mongoConverter;
+
     @Autowired
     private DataUtils dataUtils;
 
@@ -409,14 +416,12 @@ public class KylinRefundsStatusServiceImpl {
         double onePrice = (priceActual - priceExpress) / allEntitiesCount;//单价
         int refundNumber = 0;
         for (String entitiesId : orderTicketEntitiesIdsArr) {
-            Double refundedPrice = kylinOrderTicketEntitiesMapper.getRefundOverEntitiesPrice(//已退完成的
-                    orderTicketsId,
-                    KylinTableStatusConst.ORDER_REFUND_STATUS_REFUNDED,
-                    entitiesId
+            KylinOrderTicketEntities EntitiesInfo = kylinOrderTicketEntitiesMapper.selectOne(//已退完成的
+                    new QueryWrapper<KylinOrderTicketEntities>()
+                            .eq("order_ticket_entities_id", entitiesId)
             );
-            if (null == refundedPrice) {
-                refundedPrice = 0.0;
-            }
+            BigDecimal refundedPrice = EntitiesInfo.getRefundPrice();
+
             KylinOrderRefundEntities refundEntitiesInfo = kylinOrderRefundsEntitiesMapper.selectOne(
                     new QueryWrapper<KylinOrderRefundEntities>()
                             .eq("order_refunds_id", refundInfo.getOrderRefundsId())
@@ -425,32 +430,30 @@ public class KylinRefundsStatusServiceImpl {
 
             KylinOrderTicketEntities entitiesTable = new KylinOrderTicketEntities();
             double priceNew = refundEntitiesInfo.getRefundPrice().doubleValue() + refundedPrice.doubleValue();
+            int isPayment = 0;
             if (priceNew == onePrice) {
-                entitiesTable.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT3);
-                refundNumber ++;
+                isPayment = KylinTableStatusConst.ENTITIES_IS_PAYMENT3;
+                refundNumber++;
             } else {
-                entitiesTable.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT4);
+                isPayment = KylinTableStatusConst.ENTITIES_IS_PAYMENT4;
             }
+            entitiesTable.setIsPayment(isPayment);
             entitiesTable.setUpdatedAt(LocalDateTime.now());
             entitiesTable.setRefundPrice(BigDecimal.valueOf(priceNew));
+            Integer[] entitiesTableIsPayment = {KylinTableStatusConst.ENTITIES_IS_PAYMENT2, KylinTableStatusConst.ENTITIES_IS_PAYMENT4};
             kylinOrderTicketEntitiesMapper.update(entitiesTable, new UpdateWrapper<KylinOrderTicketEntities>()
                     .eq("order_ticket_entities_id", entitiesId)
-                    .eq("is_payment", KylinTableStatusConst.ENTITIES_IS_PAYMENT2)
+                    .in("is_payment", entitiesTableIsPayment)
             );
 
-            KylinOrderTicketEntitiesVo kylinOrderTicketEntitiesVo = new KylinOrderTicketEntitiesVo();
-            if (priceNew == onePrice) {
-                kylinOrderTicketEntitiesVo.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT3);
-            } else {
-                kylinOrderTicketEntitiesVo.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT4);
-            }
-            kylinOrderTicketEntitiesVo.setUpdatedAt(LocalDateTime.now().toString());
-            kylinOrderTicketEntitiesVo.setRefundPrice(BigDecimal.valueOf(priceNew));
-            BasicDBObject entitiesObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketEntitiesVo)));
-            Document entitiesDoc = mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).findOneAndUpdate(
+            HashMap<String, Object> EntitiesVo = new HashMap<>();
+            EntitiesVo.put("updatedAt", DateUtil.getNowTime());
+            EntitiesVo.put("refundPrice", BigDecimal.valueOf(priceNew));
+            EntitiesVo.put("isPayment", isPayment);
+            BasicDBObject EntitiesVov = new BasicDBObject("$set", mongoConverter.convertToMongoType(EntitiesVo));
+            UpdateResult updateResult = mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).updateOne(
                     Query.query(Criteria.where("orderTicketEntitiesId").is(entitiesId)).getQueryObject(),
-                    entitiesObject,
-                    new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
+                    EntitiesVov
             );
 
             dataUtils.delOrderTicketEntitiesRedis(entitiesId);
@@ -468,17 +471,15 @@ public class KylinRefundsStatusServiceImpl {
                         .eq("order_tickets_id", orderTicketsId)
         );
 
-        KylinOrderTicketVo kylinOrderTicketVoOrder = new KylinOrderTicketVo();
-        kylinOrderTicketVoOrder.setStatus(newStatus);
-        kylinOrderTicketVoOrder.setRefundNumber(num);
-        kylinOrderTicketVoOrder.setUpdatedAt(LocalDateTime.now().toString());
-        // TODO: 2021/6/16  error
-        // kylinOrderTicketVoOrder.setPriceRefund(BigDecimal.valueOf(price));
-        BasicDBObject orderEntitiesObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketVoOrder)));
-        Document docOrder = mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).findOneAndUpdate(
+        HashMap<String, Object> orderVo = new HashMap<>();
+        orderVo.put("updatedAt", DateUtil.getNowTime());
+        orderVo.put("priceRefund", BigDecimal.valueOf(price));
+        orderVo.put("status", newStatus);
+        orderVo.put("refundNumber", num);
+        BasicDBObject orderVov = new BasicDBObject("$set", mongoConverter.convertToMongoType(orderVo));
+        UpdateResult orderUpdateResult = mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne(
                 Query.query(Criteria.where("orderTicketsId").is(orderTicketsId)).getQueryObject(),
-                orderEntitiesObject,
-                new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
+                orderVov
         );
         dataUtils.delOrderTicketRedis(orderTicketsId);
         mongoVoUtils.resetOrderListVo(orderInfo.getUserId(), 2, orderTicketsId,null);
@@ -490,7 +491,6 @@ public class KylinRefundsStatusServiceImpl {
         kylinOrderRefunds.setRefundType(refundCallbackParam.getRefund_type());
         kylinOrderRefunds.setRefundId(refundCallbackParam.getRefund_id());
         kylinOrderRefunds.setRefundAt(refundCallbackParam.getRefund_at());
-        kylinOrderRefunds.setRefundError(refundCallbackParam.getRefund_error());
         kylinOrderRefunds.setUpdatedAt(LocalDateTime.now());
         kylinOrderRefundsMapper.update(
                 kylinOrderRefunds,