备注添加

ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/ManagerOrderVO.java

@@ -92,4 +92,6 @@ public class ManagerOrderVO {
     private String receiverDistrict;
 
     private String receiverDetailAddress;
+
+    private String mark;
 }

ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/ManagerRefundOrderVO.java

@@ -75,4 +75,6 @@ import java.util.List;
 
      @ApiModelProperty(name = "handleMan", value = "处理人员")
      private String handleMan;
+
+     private String mark;
  }

ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberController.java

@@ -78,6 +78,14 @@ public class MemberController extends BaseController {
         return ResponseEntity.ok(service.update(member));
     }
 
+    @ApiOperation("修改会员备注信息")
+    @PreAuthorize("@ss.hasPermi('ums:member:edit')")
+    @Log(title = "会员备注信息", businessType = BusinessType.UPDATE)
+    @PostMapping("/mark/update")
+    public ResponseEntity<Integer> editMark(@RequestBody Member member) {
+        return ResponseEntity.ok(service.updateMark(member));
+    }
+
     @ApiOperation("删除会员信息")
     @PreAuthorize("@ss.hasPermi('ums:member:remove')")
     @Log(title = "会员信息", businessType = BusinessType.DELETE)

ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/MemberQuery.java

@@ -24,6 +24,9 @@ public class MemberQuery {
     @ApiModelProperty("手机号码 精确匹配")
     private String phone;
 
+    @ApiModelProperty("有无备注 1：有备注  0：无备注")
+    private Integer hasMark;
+
     @ApiModelProperty("用户备注 精确匹配")
     private String mark;
 

ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/MemberCartVO.java

@@ -22,6 +22,8 @@ public class MemberCartVO extends BaseAudit {
    /** 用户ID */
     @Excel(name = "用户ID")
     private Long memberId;
+    private String nickname;
+    private String mark;
    /** 商品ID */
     @Excel(name = "商品ID")
     private Long productId;

ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberCartService.java

@@ -14,6 +14,7 @@ import com.cyl.manager.ums.convert.MemberCartConvert;
 import com.cyl.manager.ums.domain.Member;
 import com.cyl.manager.ums.domain.MemberCart;
 import com.cyl.manager.ums.mapper.MemberCartMapper;
+import com.cyl.manager.ums.mapper.MemberMapper;
 import com.cyl.manager.ums.pojo.query.MemberCartQuery;
 import com.cyl.manager.ums.pojo.vo.MemberCartVO;
 import com.cyl.manager.ums.pojo.vo.form.UpdateMemberCartForm;
@@ -49,6 +50,8 @@ public class MemberCartService {
     @Autowired
     private SkuMapper skuMapper;
     @Autowired
+    private MemberMapper memberMapper;
+    @Autowired
     private ProductMapper productMapper;
     @Autowired
     private MemberCartConvert memberCartConvert;

ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberService.java

@@ -80,6 +80,18 @@ public class MemberService {
             qw.ge("create_time", query.getBeginTime());
             qw.lt("create_time", query.getEndTime());
         }
+        if (query.getHasMark() != null) {
+            switch (query.getHasMark()) {
+                case 0:
+                    qw.isNull("mark").or().eq("mark","");
+                    break;
+                case 1:
+                    qw.isNotNull("mark").ne("mark","");
+                    break;
+                default:
+                    break;
+            }
+        }
         if (query.getStatus() != null){
             qw.eq("status", query.getStatus());
         }
@@ -107,6 +119,14 @@ public class MemberService {
         return memberMapper.updateById(member);
     }
 
+    public int updateMark(Member member) {
+        UpdateWrapper<Member> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("mark",member.getMark())
+                .set("update_time",LocalDateTime.now())
+                .eq("id",member.getId());
+        return memberMapper.update(null,updateWrapper);
+    }
+
     /**
      * 删除会员信息信息
      *

ruoyi-mall/src/main/resources/mapper/oms/AftersaleMapper.xml

@@ -64,7 +64,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.handle_note   note,
         a.handle_man,
         c.nickname      nickName,
-        c.phone_hidden         phone
+        c.phone_hidden         phone,
+        c.mark
         FROM oms_aftersale a
         left join ums_member c on a.member_id = c.id
         <where>

ruoyi-mall/src/main/resources/mapper/oms/OrderMapper.xml

@@ -120,7 +120,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 --         b.product_id       productId,
 --         b.product_name     productName,
         c.phone_hidden            userPhone,
-        c.nickname         nickName
+        c.nickname         nickName,
+        c.mark
         from oms_order a
 --         left join oms_order_item b on a.id = b.order_id
         left join ums_member c on a.member_id = c.id

ruoyi-mall/src/main/resources/mapper/ums/MemberCartMapper.xml

@@ -52,7 +52,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.sp_data,
         a.quantity,
         a.create_time,
-        b.phone_hidden
+        b.phone_hidden,
+        b.nickname,
+        b.mark
         from ums_member_cart a
         inner join ums_member b on a.member_id=b.id
         <where>