gongzuming
2024-10-11 34a5c00c80235213fca81689636c79fbad47a5fe
src/main/java/com/mzl/flower/service/payment/OrderService.java
@@ -469,6 +469,7 @@
            }
        });
        /* 替换支付修改
        WxMaJscode2SessionResult session = null;
        try {
            session = weChatService.getWxMaSessionInfo(dto.getWxcode());
@@ -479,6 +480,7 @@
        if (StringUtils.isBlank(openId)) {
            throw new ValidationException("微信登录失败");
        }
        */
        Address address = addressMapper.selectById(dto.getAddressId());
        List<TransportOrderDTO> tLs = transportService.getPreOrderTransportList(address
@@ -532,7 +534,7 @@
        }
        totalAmount = totalAmount.add(p.getPacking()).add(transportFee);
        if(totalAmount.doubleValue() <= 0){//假如总价小于等于0,则支付0.01元
            totalAmount = new BigDecimal(0.01);
            totalAmount = new BigDecimal("0.01");
        }
        order.setTotalAmount(totalAmount);
@@ -609,7 +611,7 @@
        }
        order.setOrderNo(getOrderNo());
        order.setPayOpenid(openId);
        //order.setPayOpenid(openId);替换支付修改
        orderMapper.insert(order);
        //处理积分商品兑换券
@@ -624,10 +626,7 @@
            }
        }
        Map map = paymentSybService.prepay(order);
        map.put("_testV2OrderId", order.getId());
        return map;
        return paymentSybService.prepay(order);
    }
    private void usePointGoods(String orderId, List<Long> goodsRecordIdList){
@@ -780,6 +779,7 @@
        if(orders == null || orders.size() == 0){
            return;
        }
        /*
        for (Order o : orders) {
            //set status_backend = 'RECEIVE', status = 'RECEIVE'
            o.setStatusBackend("RECEIVE");
@@ -796,7 +796,8 @@
            orderMapper.updateById(o);
        }
        //orderMapper.setPartnerOrderReceive();
        */
        orderMapper.setPartnerOrderReceive();
    }
    /**
@@ -817,6 +818,7 @@
        o.setStatusBackend(Constants.ORDER_STATUS_BACKEND.RECEIVE.name());
        o.update(SecurityUtils.getUserId());
        /*
        //发送微信发货请求
        JSONObject jsonObject = sendWxDeliveryGood(o);
        if (jsonObject != null && (int) jsonObject.get("errcode") == 0) {
@@ -826,7 +828,7 @@
            o.setWxDeliveryGood(false);
            o.setWxDeliveryMsg(GsonUtil.toJson(jsonObject));
        }
        */
        orderMapper.updateById(o);
    }
@@ -1240,6 +1242,7 @@
        customerPointService.consumptionPoint(totalAmount, o.getOrderNo(), o.getCreateBy());
    }
    /*
    public JSONObject sendWxDeliveryGood(Order o) {
        JSONObject json = new JSONObject();
        List<OrderItem> items = orderItemMapper.selectList(new LambdaQueryWrapper<OrderItem>()
@@ -1278,6 +1281,7 @@
            return json;
        }
    }
    */
    public Order confirmOrderReceive(String id) {
        Order o = orderMapper.selectById(id);