diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsWebsiteFieldMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsWebsiteFieldMapper.xml index 529b688..dc903bc 100644 --- a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsWebsiteFieldMapper.xml +++ b/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsWebsiteFieldMapper.xml @@ -53,6 +53,12 @@ AND a.create_time <= #{param.createTimeEnd} + + AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') + OR a.value LIKE CONCAT('%', #{param.keywords}, '%') + OR a.name LIKE CONCAT('%', #{param.keywords}, '%') + ) + diff --git a/src/main/java/com/gxwebsoft/pwl/mapper/xml/PwlProjectMapper.xml b/src/main/java/com/gxwebsoft/pwl/mapper/xml/PwlProjectMapper.xml index b5827d0..57eafd4 100644 --- a/src/main/java/com/gxwebsoft/pwl/mapper/xml/PwlProjectMapper.xml +++ b/src/main/java/com/gxwebsoft/pwl/mapper/xml/PwlProjectMapper.xml @@ -138,7 +138,6 @@ AND (a.name LIKE CONCAT('%', #{param.keywords}, '%') OR a.id = #{param.keywords} OR a.code = #{param.keywords} - OR a.item_year = #{param.keywords} ) diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java index 19f04b6..436f63e 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java @@ -163,6 +163,10 @@ public class ShopOrderController extends BaseController { @Operation(summary = "修改订单") @PutMapping() public ApiResult update(@RequestBody ShopOrder shopOrder) { + // 申请退款 + if(shopOrder.getOrderStatus().equals(4)){ + shopOrder.setRefundApplyTime(LocalDateTime.now()); + } if (shopOrderService.updateById(shopOrder)) { return success("修改成功"); }