diff --git a/food-common/src/main/java/com/zbkj/common/model/order/StoreOrderReturn.java b/food-common/src/main/java/com/zbkj/common/model/order/StoreOrderReturn.java index 857bf5a..84dda8e 100644 --- a/food-common/src/main/java/com/zbkj/common/model/order/StoreOrderReturn.java +++ b/food-common/src/main/java/com/zbkj/common/model/order/StoreOrderReturn.java @@ -26,6 +26,10 @@ public class StoreOrderReturn implements Serializable { * 用户id */ private Integer uid; + /** + * 售后单号 + */ + private String code; /** * 订单id */ diff --git a/food-common/src/main/java/com/zbkj/common/model/product/StoreProduct.java b/food-common/src/main/java/com/zbkj/common/model/product/StoreProduct.java index 659d3b8..f5d1e7a 100644 --- a/food-common/src/main/java/com/zbkj/common/model/product/StoreProduct.java +++ b/food-common/src/main/java/com/zbkj/common/model/product/StoreProduct.java @@ -35,6 +35,9 @@ public class StoreProduct implements Serializable { @ApiModelProperty(value = "商户Id(0为总后台管理员创建,不为0的时候是商户后台创建)") private Integer merId; + @ApiModelProperty(value = "质检报告") + private String qualityTest; + @ApiModelProperty(value = "商品图片") private String image; diff --git a/food-common/src/main/java/com/zbkj/common/request/StoreProductAddRequest.java b/food-common/src/main/java/com/zbkj/common/request/StoreProductAddRequest.java index e3fce80..f74382d 100644 --- a/food-common/src/main/java/com/zbkj/common/request/StoreProductAddRequest.java +++ b/food-common/src/main/java/com/zbkj/common/request/StoreProductAddRequest.java @@ -114,6 +114,9 @@ public class StoreProductAddRequest implements Serializable { @ApiModelProperty(value = "商品描述") private String content; + @ApiModelProperty(value = "质检报告") + private String qualityTest; + @ApiModelProperty(value = "优惠券id集合") private List couponIds; diff --git a/food-common/src/main/java/com/zbkj/common/request/UpdateOrderRequest.java b/food-common/src/main/java/com/zbkj/common/request/UpdateOrderRequest.java new file mode 100644 index 0000000..232a1f5 --- /dev/null +++ b/food-common/src/main/java/com/zbkj/common/request/UpdateOrderRequest.java @@ -0,0 +1,31 @@ +package com.zbkj.common.request; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@ApiModel(value="UpdateOrderRequest对象", description="UpdateOrderRequest对象") +public class UpdateOrderRequest implements Serializable { + + private static final long serialVersionUID = -6133994384185333872L; + + @ApiModelProperty(value = "预下单订单号") + @NotBlank(message = "订单号不能为空") + private String orderId; + + @ApiModelProperty(value = "订单备注") + private String mark; + + @ApiModelProperty(value = "预约送达时间") + @NotBlank(message = "预约送达时间不能为空") + private String deliveryTime; + +} diff --git a/food-front/src/main/java/com/zbkj/front/controller/StoreOrderController.java b/food-front/src/main/java/com/zbkj/front/controller/StoreOrderController.java index d6d3655..f7a93ca 100644 --- a/food-front/src/main/java/com/zbkj/front/controller/StoreOrderController.java +++ b/food-front/src/main/java/com/zbkj/front/controller/StoreOrderController.java @@ -92,6 +92,15 @@ public class StoreOrderController { return CommonResult.success(orderService.createOrder(orderRequest)); } + /** + * 修改订单 + */ + @ApiOperation(value = "修改订单") + @RequestMapping(value = "/updateOrder", method = RequestMethod.POST) + public CommonResult updateOrder(@Validated @RequestBody UpdateOrderRequest orderRequest) { + return CommonResult.success(orderService.updateOrder(orderRequest)); + } + /** * 订单列表 * @param type 类型 diff --git a/food-service/src/main/java/com/zbkj/service/service/OrderService.java b/food-service/src/main/java/com/zbkj/service/service/OrderService.java index 342e3e5..4942b5c 100644 --- a/food-service/src/main/java/com/zbkj/service/service/OrderService.java +++ b/food-service/src/main/java/com/zbkj/service/service/OrderService.java @@ -162,4 +162,10 @@ public interface OrderService { */ CommonPage canApplyOrderList(PageParamRequest pageRequest); + /** + * 修改订单 + * @param orderRequest + * @return + */ + Boolean updateOrder(UpdateOrderRequest orderRequest); } diff --git a/food-service/src/main/java/com/zbkj/service/service/StoreOrderService.java b/food-service/src/main/java/com/zbkj/service/service/StoreOrderService.java index 66a69a9..4c4a8eb 100644 --- a/food-service/src/main/java/com/zbkj/service/service/StoreOrderService.java +++ b/food-service/src/main/java/com/zbkj/service/service/StoreOrderService.java @@ -89,9 +89,10 @@ public interface StoreOrderService extends IService { * 订单备注 * @param orderNo 订单编号 * @param mark 备注 + * @param deliveryTime 送达时间 * @return Boolean */ - Boolean mark(String orderNo, String mark); + Boolean mark(String orderNo, String mark, String deliveryTime); /** * 拒绝退款 diff --git a/food-service/src/main/java/com/zbkj/service/service/impl/OrderServiceImpl.java b/food-service/src/main/java/com/zbkj/service/service/impl/OrderServiceImpl.java index c3fbae8..85abf30 100644 --- a/food-service/src/main/java/com/zbkj/service/service/impl/OrderServiceImpl.java +++ b/food-service/src/main/java/com/zbkj/service/service/impl/OrderServiceImpl.java @@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.pagehelper.PageHelper; +import com.github.pagehelper.util.StringUtil; import com.zbkj.common.constants.*; import com.zbkj.common.exception.CrmebException; import com.zbkj.common.model.bargain.StoreBargain; @@ -319,6 +320,7 @@ public class OrderServiceImpl implements OrderService { StoreOrderReturn oReturn = new StoreOrderReturn(); oReturn.setUid(existStoreOrder.getUid()); + oReturn.setCode(CrmebUtil.getOrderNo("")); oReturn.setOrderId(existStoreOrder.getId()); oReturn.setContactPhone(request.getContactPhone()); oReturn.setReturnReason(existStoreOrder.getRefundReasonWap()); @@ -902,6 +904,14 @@ public class OrderServiceImpl implements OrderService { return CommonPage.restPage(orderList); } + @Override + public Boolean updateOrder(UpdateOrderRequest orderRequest) { + String orderId = orderRequest.getOrderId(); + String mark = orderRequest.getMark(); + String deliveryTime = orderRequest.getDeliveryTime(); + return storeOrderService.mark(orderId, mark, deliveryTime); + } + private ComputedOrderPriceResponse computedPrice(OrderComputedPriceRequest request, OrderInfoVo orderInfoVo, User user) { // 计算各种价格 ComputedOrderPriceResponse priceResponse = new ComputedOrderPriceResponse(); @@ -1272,7 +1282,7 @@ public class OrderServiceImpl implements OrderService { } // 生成订单号 - String orderNo = CrmebUtil.getOrderNo("order"); + String orderNo = CrmebUtil.getOrderNo(""); // 购买赠送的积分 int gainIntegral = 0; diff --git a/food-service/src/main/java/com/zbkj/service/service/impl/StoreOrderServiceImpl.java b/food-service/src/main/java/com/zbkj/service/service/impl/StoreOrderServiceImpl.java index 83b083f..d45b9b1 100644 --- a/food-service/src/main/java/com/zbkj/service/service/impl/StoreOrderServiceImpl.java +++ b/food-service/src/main/java/com/zbkj/service/service/impl/StoreOrderServiceImpl.java @@ -633,9 +633,10 @@ public class StoreOrderServiceImpl extends ServiceImpl lqw = Wrappers.lambdaQuery(); - lqw.select(StoreProduct::getId, StoreProduct::getImage, StoreProduct::getStoreName, StoreProduct::getSliderImage, - StoreProduct::getOtPrice, StoreProduct::getStock, StoreProduct::getSales, StoreProduct::getPrice, StoreProduct::getActivity, - StoreProduct::getFicti, StoreProduct::getIsSub, StoreProduct::getStoreInfo, StoreProduct::getBrowse, StoreProduct::getUnitName, StoreProduct::getTags, StoreProduct::getSpecType); + lqw.select(StoreProduct::getId, StoreProduct::getImage, StoreProduct::getStoreName, StoreProduct::getSliderImage, StoreProduct::getQualityTest, + StoreProduct::getOtPrice, StoreProduct::getStock, StoreProduct::getSales, StoreProduct::getPrice, StoreProduct::getActivity, StoreProduct::getSpecType, + StoreProduct::getFicti, StoreProduct::getIsSub, StoreProduct::getStoreInfo, StoreProduct::getBrowse, StoreProduct::getUnitName, StoreProduct::getTags); lqw.eq(StoreProduct::getId, id); lqw.eq(StoreProduct::getIsRecycle, false); lqw.eq(StoreProduct::getIsDel, false);