From 7fe9e0cb5c3559718d8bb528b98c77b441e4666f Mon Sep 17 00:00:00 2001 From: chuzhichao Date: Fri, 30 Jun 2023 17:04:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=B8=AD=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fjp/lc/test/service/ServiceTest.java | 11 +++++++++++ .../cyl/manager/oms/controller/OrderController.java | 9 ++++++++- .../main/java/com/cyl/manager/oms/domain/Order.java | 4 ++++ .../com/cyl/manager/oms/pojo/vo/ManagerOrderVO.java | 3 +++ .../com/cyl/manager/oms/service/OrderService.java | 12 ++++++++++++ .../src/main/resources/mapper/oms/OrderMapper.xml | 1 + 6 files changed, 39 insertions(+), 1 deletion(-) diff --git a/ruoyi-admin/src/test/java/com/fjp/lc/test/service/ServiceTest.java b/ruoyi-admin/src/test/java/com/fjp/lc/test/service/ServiceTest.java index 0ec77df..6562ff6 100644 --- a/ruoyi-admin/src/test/java/com/fjp/lc/test/service/ServiceTest.java +++ b/ruoyi-admin/src/test/java/com/fjp/lc/test/service/ServiceTest.java @@ -1,6 +1,8 @@ package com.fjp.lc.test.service; +import cn.hutool.core.lang.Snowflake; import cn.hutool.core.util.CharsetUtil; +import cn.hutool.core.util.IdUtil; import cn.hutool.crypto.SecureUtil; import cn.hutool.crypto.symmetric.AES; import com.cyl.manager.ums.service.MemberCartService; @@ -62,4 +64,13 @@ public class ServiceTest { String decryptStr = aes.decryptStr(encryptHex, CharsetUtil.CHARSET_UTF_8); System.out.println("解密：" + decryptStr); } + + @Test + public void test4(){ + //参数1为终端ID +//参数2为数据中心ID + Snowflake snowflake = IdUtil.createSnowflake(1, 1); + long id = snowflake.nextId(); + System.out.println("id:" + id); + } } diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderController.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderController.java index 6498759..d76c0b5 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderController.java @@ -50,7 +50,6 @@ public class OrderController extends BaseController { @PostMapping("/list") public ResponseEntity> list(@RequestBody ManagerOrderQueryRequest query, Pageable page) { return ResponseEntity.ok(service.selectList(query, page)); -// return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal())); } @ApiOperation("导出订单表列表") @@ -94,4 +93,12 @@ public class OrderController extends BaseController { public ResponseEntity remove(@PathVariable Long id) { return ResponseEntity.ok(service.deleteById(id)); } + + @ApiOperation("添加备注") + @PreAuthorize("@ss.hasPermi('oms:order:note:add')") + @Log(title = "订单表", businessType = BusinessType.UPDATE) + @PostMapping("/merchantNote/add") + public ResponseEntity saveMerchantNote(@RequestBody Order order){ + return ResponseEntity.ok(service.saveMerchantNote(order)); + } } diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/Order.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/Order.java index de1f538..c21088d 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/Order.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/Order.java @@ -122,6 +122,10 @@ public class Order extends BaseAudit { @Excel(name = "订单备注") private String note; + @ApiModelProperty("商家备注") + @Excel(name = "商家备注") + private String merchantNote; + @ApiModelProperty("确认收货状态：0->未确认；1->已确认") @Excel(name = "确认收货状态：0->未确认；1->已确认") private Integer confirmStatus; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/ManagerOrderVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/ManagerOrderVO.java index 5cdb396..63481ea 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/ManagerOrderVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/ManagerOrderVO.java @@ -66,6 +66,9 @@ public class ManagerOrderVO { @ApiModelProperty(name = "note",value = "备注",required = true,dataType = "String") private String note; + @ApiModelProperty("商家备注") + private String merchantNote; + @ApiModelProperty(name = "spData",value = "商品sku属性",required = true,dataType = "String") private String spData; diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderService.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderService.java index adf83e9..caa11e4 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderService.java @@ -11,6 +11,7 @@ import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.cyl.h5.pojo.dto.OrderCreateDTO; @@ -49,6 +50,7 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.Pageable; import org.apache.commons.lang3.StringUtils; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import com.cyl.manager.oms.mapper.OrderMapper; import com.cyl.manager.oms.domain.Order; @@ -268,4 +270,14 @@ public class OrderService { } + public Integer saveMerchantNote(Order order) { + Order orderInDb = orderMapper.selectById(order.getId()); + if (orderInDb == null){ + throw new RuntimeException("订单不存在"); + } + UpdateWrapper qw = new UpdateWrapper<>(); + qw.eq("id", order.getId()); + qw.set("merchant_note", order.getMerchantNote()); + return orderMapper.update(null, qw); + } } diff --git a/ruoyi-mall/src/main/resources/mapper/oms/OrderMapper.xml b/ruoyi-mall/src/main/resources/mapper/oms/OrderMapper.xml index 5307c6e..676bbaa 100644 --- a/ruoyi-mall/src/main/resources/mapper/oms/OrderMapper.xml +++ b/ruoyi-mall/src/main/resources/mapper/oms/OrderMapper.xml @@ -91,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.total_amount totalAmount, a.pay_amount payAmount, a.note, + a.merchant_note merchantNote, a.create_time createTime, a.payment_time payTime, a.receive_time receiveTime,