订单中添加平台备注

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);
+    }
 }

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<Page<ManagerOrderVO>> 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<Integer> 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<Integer> saveMerchantNote(@RequestBody Order order){
+        return ResponseEntity.ok(service.saveMerchantNote(order));
+    }
 }

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;

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;
 

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<Order> qw = new UpdateWrapper<>();
+        qw.eq("id", order.getId());
+        qw.set("merchant_note", order.getMerchantNote());
+        return orderMapper.update(null, qw);
+    }
 }

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,