mongo refundPrice 不能更新

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

@@ -57,20 +57,24 @@
                             $.modal.loading("正在查询订单，请稍后...");
                         },
                         success: function (result) {
-                            $("#orderTicketsId").val(result.orderTicketVo.orderTicketsId);
-                            var options = {
-                                data: result.orderTicketEntitiesVo,
-                                pagination: false,
-                                columns: [{
-                                    checkbox: true
-                                },
-                                    {
-                                        field: 'orderTicketEntitiesId',
-                                        title: '入场人id'
+                            if (result.msg) {
+                                layer.msg("未找到该订单信息");
+                            } else {
+                                $("#orderTicketsId").val(result.orderTicketVo.orderTicketsId);
+                                var options = {
+                                    data: result.orderTicketEntitiesVo,
+                                    pagination: false,
+                                    columns: [{
+                                        checkbox: true
                                     },
-                                ]
-                            };
-                            $.table.init(options);
+                                        {
+                                            field: 'orderTicketEntitiesId',
+                                            title: '入场人id'
+                                        },
+                                    ]
+                                };
+                                $.table.init(options);
+                            }
                             $.modal.closeLoading();
                         }
                     };

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

@@ -2,22 +2,18 @@ package com.liquidnet.client.admin.zhengzai.kylin.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.liquidnet.client.admin.common.utils.StringUtils;
 import com.liquidnet.commons.lang.util.BeanUtil;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dao.KylinOrderRefundsEntitiesDao;
 import com.liquidnet.service.kylin.dao.OrderRefundDao;
 import com.liquidnet.service.kylin.dto.param.RefundApplyParam;
-import com.liquidnet.service.kylin.dto.param.RefundCallbackParam;
 import com.liquidnet.service.kylin.dto.param.RefundSearchParam;
 import com.liquidnet.service.kylin.dto.vo.admin.OrderDetailsAdminVo;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo;
-import com.liquidnet.service.kylin.dto.vo.returns.OrderDetailsVo;
 import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
 import com.liquidnet.service.kylin.entity.KylinOrderTicketEntities;
 import com.liquidnet.service.kylin.entity.KylinOrderTicketStatus;
@@ -245,50 +241,6 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
         return pageInfoTmp;
     }
 
-    public String refundCallback(RefundCallbackParam refundCallbackParam) {
-        KylinOrderRefunds refundInfo = kylinOrderRefundsMapper.selectOne(
-                new UpdateWrapper<KylinOrderRefunds>()
-                        .eq("order_refund_code", refundCallbackParam.getOrder_refund_code())
-        );
-        if (refundInfo == null) {
-            log.info("Failed:{}.RefundController refundCallback: 退款订单查询失败，编号{}", "KylinOrderRefundsServiceImplRefundCallback", refundCallbackParam.getOrder_refund_code());
-            return "fail";
-        }
-        if (refundInfo.getStatus() == KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL) {
-            log.info("Failed:{}.RefundController refundCallback: 退款订单已取消，编号{}", "KylinOrderRefundsServiceImplRefundCallback", refundCallbackParam.getOrder_refund_code());
-            return "fail";
-        }
-        if (refundInfo.getStatus() == KylinTableStatusConst.ORDER_REFUND_STATUS_REFUNDED) {
-            log.info("Failed:{}.RefundController refundCallback: 退款订单已退款，编号{}", "KylinOrderRefundsServiceImplRefundCallback", refundCallbackParam.getOrder_refund_code());
-            return "success";
-        }
-
-        Integer status = refundCallbackParam.getStatus();
-        if (1 == status) { // 退款成功
-            boolean res = kylinRefundsStatusServiceImpl.orderTicketRefunded(refundCallbackParam, refundInfo);
-            if (res) {
-                return "success";
-            } else {
-                return "fail";
-            }
-        }
-        if (0 == status) { // 退款失败
-            KylinOrderRefunds kylinOrderRefunds = new KylinOrderRefunds();
-            kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_ERROR);
-            kylinOrderRefunds.setRefundCode(refundCallbackParam.getRefund_code());
-            kylinOrderRefunds.setRefundType(refundCallbackParam.getRefund_type());
-            kylinOrderRefunds.setRefundId(refundCallbackParam.getRefund_id());
-            kylinOrderRefunds.setRefundAt(refundCallbackParam.getRefund_at());
-            kylinOrderRefunds.setRefundError(refundCallbackParam.getRefund_error());
-
-            kylinOrderRefundsMapper.update(
-                    kylinOrderRefunds,
-                    new UpdateWrapper<KylinOrderRefunds>().eq("order_refund_code", refundCallbackParam.getOrder_refund_code())
-            );
-        }
-        return "success";
-    }
-
     public OrderDetailsAdminVo orderDetails(String orderCode) {
         LambdaQueryWrapper<KylinOrderTickets> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(KylinOrderTickets::getOrderCode, orderCode);

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

@@ -12,7 +12,6 @@ import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dto.param.RefundApplyParam;
-import com.liquidnet.service.kylin.dto.param.RefundCallbackParam;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
 import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
@@ -329,95 +328,4 @@ public class KylinRefundsStatusServiceImpl {
         return true;
     }
 
-    public boolean orderTicketRefunded(RefundCallbackParam refundCallbackParam, KylinOrderRefunds refundInfo) {
-        String orderTicketEntitiesIds = refundInfo.getOrderTicketEntitiesIds();
-        String[] orderTicketEntitiesIdsArr = orderTicketEntitiesIds.split(",");
-        Integer EntitiesIdsCount = orderTicketEntitiesIdsArr.length;
-        String orderTicketsId = refundInfo.getOrderTicketsId();
-
-        // 更新数据
-        // 订单状态表
-        KylinOrderTickets orderInfo = kylinOrderTicketsMapper.selectOne(
-                new QueryWrapper<KylinOrderTickets>().eq("order_tickets_id", orderTicketsId)
-        );
-        KylinOrderTicketStatus orderStatusTable = new KylinOrderTicketStatus();
-        int newStatus = 0;
-        if (EntitiesIdsCount + orderInfo.getRefundNumber() == orderInfo.getNumber()) {
-            newStatus = KylinTableStatusConst.ORDER_STATUS4;
-        } else {
-            newStatus = KylinTableStatusConst.ORDER_STATUS6;
-        }
-        orderStatusTable.setStatus(newStatus);
-        kylinOrderTicketStatusMapper.update(
-                orderStatusTable, new UpdateWrapper<KylinOrderTicketStatus>()
-                        .eq("order_id", orderTicketsId)
-        );
-
-        // 订单表
-        double price = orderInfo.getPriceRefund().doubleValue() + refundInfo.getPrice().doubleValue();
-        Integer num = orderInfo.getRefundNumber() + EntitiesIdsCount;
-        KylinOrderTickets update = new KylinOrderTickets();
-        update.setRefundNumber(num);
-        update.setPriceRefund(BigDecimal.valueOf(price));
-        kylinOrderTicketsMapper.update(
-                update, new UpdateWrapper<KylinOrderTickets>()
-                        .eq("order_tickets_id", orderTicketsId)
-        );
-        KylinOrderTicketVo kylinOrderTicketVoOrder = new KylinOrderTicketVo();
-        kylinOrderTicketVoOrder.setStatus(newStatus);
-        kylinOrderTicketVoOrder.setRefundNumber(num);
-        kylinOrderTicketVoOrder.setPriceRefund(BigDecimal.valueOf(price));
-        BasicDBObject orderEntitiesObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketVoOrder)));
-        Document docOrder = mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).findOneAndUpdate(
-                Query.query(Criteria.where("orderTicketsId").is(orderTicketsId)).getQueryObject(),
-                orderEntitiesObject,
-                new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
-        );
-        dataUtils.delOrderTicketRedis(orderTicketsId);
-
-        // 入场人
-        for (String entitiesId : orderTicketEntitiesIdsArr) {
-            KylinOrderTicketEntities entitiesTable = new KylinOrderTicketEntities();
-            // TODO: 2021/5/27 事物 and 部分退款
-            entitiesTable.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT3);
-            kylinOrderTicketEntitiesMapper.update(entitiesTable, new UpdateWrapper<KylinOrderTicketEntities>()
-                    .eq("order_ticket_entities_id", entitiesId)
-                    .eq("is_payment", KylinTableStatusConst.ENTITIES_IS_PAYMENT2)
-            );
-
-            KylinOrderTicketEntitiesVo kylinOrderTicketEntitiesVo = new KylinOrderTicketEntitiesVo();
-            kylinOrderTicketEntitiesVo.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT3);
-            BasicDBObject entitiesObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketEntitiesVo)));
-            Document entitiesDoc = mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).findOneAndUpdate(
-                    Query.query(Criteria.where("orderTicketEntitiesId").is(entitiesId)).getQueryObject(),
-                    entitiesObject,
-                    new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
-            );
-
-            dataUtils.delOrderTicketEntitiesRedis(entitiesId);
-        }
-
-        // 退款单完成
-        KylinOrderRefunds kylinOrderRefunds = new KylinOrderRefunds();
-        kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_REFUNDED);
-        kylinOrderRefunds.setRefundCode(refundCallbackParam.getRefund_code());
-        kylinOrderRefunds.setRefundType(refundCallbackParam.getRefund_type());
-        kylinOrderRefunds.setRefundId(refundCallbackParam.getRefund_id());
-        kylinOrderRefunds.setRefundAt(refundCallbackParam.getRefund_at());
-        kylinOrderRefunds.setRefundError(refundCallbackParam.getRefund_error());
-
-        kylinOrderRefundsMapper.update(
-                kylinOrderRefunds,
-                new UpdateWrapper<KylinOrderRefunds>().in("order_refunds_id", refundInfo.getOrderRefundsId())
-        );
-
-        if (refundInfo.getType() == KylinTableStatusConst.ORDER_REFUND_TYPE_APPLY) {
-            // 退还库存
-            for (String entitiesId : orderTicketEntitiesIdsArr) {
-                dataUtils.changeSurplusGeneral(entitiesId, 1);
-            }
-        }
-
-        return true;
-    }
 }

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

@@ -97,7 +97,7 @@ public class KylinRefundsStatusServiceImpl {
         KylinOrderTicketVo kylinOrderTicketVoOrder = new KylinOrderTicketVo();
         kylinOrderTicketVoOrder.setStatus(newStatus);
         kylinOrderTicketVoOrder.setRefundNumber(num);
-        kylinOrderTicketVoOrder.setPriceRefund(BigDecimal.valueOf(price));
+//        kylinOrderTicketVoOrder.setPriceRefund(BigDecimal.valueOf(price));
         BasicDBObject orderEntitiesObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketVoOrder)));
         Document docOrder = mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).findOneAndUpdate(
                 Query.query(Criteria.where("orderTicketsId").is(orderTicketsId)).getQueryObject(),