ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -205,6 +205,7 @@ public R<Void> updateOrderStatus(@RequestBody Order order){ Order order1 = orderService.getById(order.getId()); order1.setOrderStatus(order.getOrderStatus()); order1.setOldOrderStatus(order.getOldOrderStatus()); orderService.updateById(order1); return R.ok(); } ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -197,6 +197,7 @@ orderDetailVO.setAddressId(userAddress.getId()); orderDetailVO.setRecieveName(userAddress.getRecieveName()); orderDetailVO.setRecievePhone(userAddress.getRecievePhone()); userAddress.setRecieveAddress(userAddress.getProvince() + userAddress.getCity() + userAddress.getDistrict() + userAddress.getRecieveAddress()); orderDetailVO.setRecieveAddress(userAddress.getRecieveAddress()); orderDetailVO.setOrderNumber(order.getOrderNumber()); orderDetailVO.setCreateTime(order.getCreateTime()); @@ -759,6 +760,7 @@ if(StringUtils.isNotEmpty(order.getAddressJson())){ UserAddress userAddress = JSON.parseObject(order.getAddressJson(), UserAddress.class); orderInfo.setRecipient(userAddress.getRecieveName() + "-" + userAddress.getRecievePhone()); userAddress.setRecieveAddress(userAddress.getProvince() + userAddress.getCity() + userAddress.getDistrict() + userAddress.getRecieveAddress()); orderInfo.setAddress(userAddress.getRecieveAddress()); } if(StringUtils.isNotEmpty(order.getExpressJson()) && !"NULL".equals(order.getExpressJson())){ ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
@@ -543,6 +543,7 @@ UserAddress userAddress = userAddressClient.getDefaultUserAddress(userid).getData(); if(null != userAddress){ userAddress.setIdStr(userAddress.getId().toString()); userAddress.setRecieveAddress(userAddress.getProvince() + userAddress.getCity() + userAddress.getDistrict() + userAddress.getRecieveAddress()); confirmOrderVo.setUserAddress(userAddress); } confirmOrderVo.setPaymentType(confirmOrder.getPaymentType()); ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsEvaluateServiceImpl.java
@@ -5,6 +5,7 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.security.service.TokenService; import com.ruoyi.order.feignClient.OrderClient; import com.ruoyi.order.feignClient.RemoteOrderGoodsClient; import com.ruoyi.order.model.Order; import com.ruoyi.other.mapper.GoodsEvaluateMapper; @@ -33,6 +34,8 @@ private RemoteOrderGoodsClient remoteOrderGoodsClient; @Resource private TokenService tokenService; @Resource private OrderClient orderClient; @Override @Transactional(rollbackFor = Exception.class) @@ -51,9 +54,11 @@ } } if (CollectionUtil.isNotEmpty(evaluates)){ Long orderId = goodsEvaluateVO.getEvaluates().get(0).getOrderId(); Order data = orderClient.getOrderById(orderId).getData(); Order order = new Order(); order.setId(goodsEvaluateVO.getEvaluates().get(0).getOrderId()); order.setOldOrderStatus(order.getOrderStatus()); order.setId(data.getId()); order.setOldOrderStatus(data.getOrderStatus()); order.setOrderStatus(8); R<Void> r = remoteOrderGoodsClient.updateOrderStatus(order); if (R.isError(r)){
