| | |
|---|
| | | orderPageListVo.setUserName(appUser.getName()); |
|---|
| | | orderPageListVo.setPhone(appUser.getPhone()); |
|---|
| | | } |
|---|
| | | RefundPass one = refundPassService.getOne(new LambdaQueryWrapper<RefundPass>().eq(RefundPass::getOrderId, orderPageListVo.getId()).eq(RefundPass::getDelFlag, 0).last(" order by create_time desc limit 0,1")); |
|---|
| | | // RefundPass one = refundPassService.getOne(new LambdaQueryWrapper<RefundPass>().eq(RefundPass::getOrderId, orderPageListVo.getId()).eq(RefundPass::getDelFlag, 0).last(" order by create_time desc limit 0,1")); |
|---|
| | | RefundPass one = refundPassService.lambdaQuery().eq(RefundPass::getOrderId, orderPageListVo.getId()).one(); |
|---|
| | | orderPageListVo.setRefundPassId(null != one ? one.getId().toString() : null); |
|---|
| | | |
|---|
| | | List<OrderGood> orderGoods = orderGoodMapper.selectList(new LambdaQueryWrapper<OrderGood>() |
|---|
| | | .eq(OrderGood::getOrderId, orderPageListVo.getId())); |
|---|
| | | BigDecimal servuceShopCharges = BigDecimal.ZERO; |
|---|
| | | BigDecimal boundShopCharges = BigDecimal.ZERO; |
|---|
| | | for (OrderGood orderGood : orderGoods) { |
|---|
| | | if(orderPageListVo.getShopId().equals(orderPageList.getShopId())){ |
|---|
| | | servuceShopCharges = servuceShopCharges.add(orderGood.getServuceShopCharges()); |
|---|
| | | } |
|---|
| | | boundShopCharges = boundShopCharges.add(orderGood.getBoundShopCharges()); |
|---|
| | | } |
|---|
| | | orderPageListVo.setGetCommission(servuceShopCharges.add(boundShopCharges)); |
|---|
| | | } |
|---|
| | | return pageInfo.setRecords(list); |
|---|
| | | } |
|---|
| | |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * 确认发货操作 |
|---|
| | | * @param orderId |
|---|
| | | * @param code |
|---|
| | | * @return |
|---|
| | | */ |
|---|
| | | @Override |
|---|
| | | public R confirmDelivery(Long orderId, String code) { |
|---|
| | | Order order = this.getById(orderId); |
|---|
| | | public R confirmDelivery(ConfirmDelivery confirmDelivery) { |
|---|
| | | Order order = this.getById(confirmDelivery.getOrderId()); |
|---|
| | | if(1 == order.getPayStatus()){ |
|---|
| | | return R.fail("订单还未完成支付"); |
|---|
| | | } |
|---|
| | |
|---|
| | | return R.fail("无效的操作"); |
|---|
| | | } |
|---|
| | | //添加快递号和修改订单状态 |
|---|
| | | order.setExpressJson(code); |
|---|
| | | order.setExpressJson(confirmDelivery.getCode()); |
|---|
| | | order.setDeliverProvince(confirmDelivery.getDeliverProvince()); |
|---|
| | | order.setDeliverProvinceCode(confirmDelivery.getDeliverProvinceCode()); |
|---|
| | | order.setDeliverCity(confirmDelivery.getDeliverCity()); |
|---|
| | | order.setDeliverCityCode(confirmDelivery.getDeliverCityCode()); |
|---|
| | | order.setDeliverDistrict(confirmDelivery.getDeliverDistrict()); |
|---|
| | | order.setDeliverDistrictCode(confirmDelivery.getDeliverDistrictCode()); |
|---|
| | | order.setOrderStatus(2); |
|---|
| | | //添加查询快递信息队列 |
|---|
| | | //一小时后定时查询快递信息 |
|---|
| | |
|---|
| | | Integer waitTime = jsonObject.getInteger("waitTime"); |
|---|
| | | redisTemplate.opsForZSet().add("order_express", order.getId(), LocalDateTime.now().plusHours(waitTime).toEpochSecond(ZoneOffset.UTC)); |
|---|
| | | |
|---|
| | | JSONObject jsonObject1 = JSON.parseObject(code); |
|---|
| | | JSONObject jsonObject1 = JSON.parseObject(confirmDelivery.getCode()); |
|---|
| | | String com = jsonObject1.getString("com"); |
|---|
| | | String num = jsonObject1.getString("num"); |
|---|
| | | UserAddress userAddress = JSON.parseObject(order.getAddressJson(), UserAddress.class); |
|---|
