fix

netflix-dao/src/main/java/com/cyksj/mapper/AddressMapper.java

@@ -0,0 +1,11 @@
+package com.cyksj.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.cyksj.model.entity.Address;
+
+/**
+ * @author chan
+ * @date 2022/10/13 3:06 PM
+ */
+public interface AddressMapper extends BaseMapper<Address> {
+}

netflix-dao/src/main/java/com/cyksj/model/entity/Address.java

@@ -0,0 +1,51 @@
+package com.cyksj.model.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author chan
+ * @date 2022-10-13 3:04 PM
+ */
+@Getter
+@Setter
+public class Address extends BaseEntity {
+
+    private Long userId;
+
+    /**
+     * 收货人
+     */
+    private String receiver;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 省份
+     */
+    private String province;
+
+    /**
+     * 城市
+     */
+    private String city;
+
+    /**
+     * 区/县
+     */
+    private String district;
+
+    /**
+     * 详细地址
+     */
+    private String address;
+
+    /**
+     * 是否为默认地址
+     */
+    private Boolean isDefault;
+
+}

netflix-dao/src/main/java/com/cyksj/model/entity/GroupsTrips.java

@@ -1,5 +1,6 @@
 package com.cyksj.model.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.ejlchina.searcher.bean.DbField;
 import com.ejlchina.searcher.bean.SearchBean;
 import lombok.AllArgsConstructor;
@@ -36,24 +37,28 @@ public class GroupsTrips extends BaseEntity {
      * 账号
      */
     @DbField("a.account")
+    @TableField(exist = false)
     private String account;
 
     /**
      * 密码
      */
     @DbField("a.password")
+    @TableField(exist = false)
     private String password;
 
     /**
      * 标题
      */
     @DbField("g.title")
+    @TableField(exist = false)
     private String title;
 
     /**
      * 商品规格
      */
     @DbField("sku.spec_val")
+    @TableField(exist = false)
     private String seecVal;
     /**
      * 录入人

netflix-dao/src/main/java/com/cyksj/model/manage/request/ReqGoodsSpecSingle.java

@@ -25,4 +25,6 @@ public class ReqGoodsSpecSingle {
 
     @NotBlank(message = "缺少属性名.")
     private String name;
+
+    private Integer maxId;
 }

netflix-dao/src/main/java/com/cyksj/model/manage/views/GoodsDonViewer.java

@@ -96,6 +96,13 @@ public class GoodsDonViewer {
     @DbField("g.detail")
     private String detail;
 
+    /**
+     * 类型
+     */
+    @DbField("g.type")
+    private Integer type;
+
+
     @DbIgnore
     private List<GoodsDonSku> skus;
 

netflix-service/src/main/java/com/cyksj/service/user/AddressService.java

@@ -0,0 +1,11 @@
+package com.cyksj.service.user;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.cyksj.model.entity.Address;
+
+/**
+ * @author chan
+ * @date 2022/10/13 3:08 PM
+ */
+public interface AddressService extends IService<Address> {
+}

netflix-service/src/main/java/com/cyksj/service/user/impl/AddressServiceImpl.java

@@ -0,0 +1,17 @@
+package com.cyksj.service.user.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.cyksj.mapper.AddressMapper;
+import com.cyksj.model.entity.Address;
+import com.cyksj.service.user.AddressService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author chan
+ * @date 2022/10/13 3:09 PM
+ */
+@Slf4j
+@Service
+public class AddressServiceImpl extends ServiceImpl<AddressMapper, Address> implements AddressService {
+}

netflix-web/src/main/java/com/cyksj/web/controller/manage/goods/CmsGoodsDonSpecController.java

@@ -72,7 +72,7 @@ public class CmsGoodsDonSpecController {
         map.put(specSingle.getId(), specSingle);
         String specMapping = Jsons.toJson(map);
 
-
+        v2spec.setMaxId(specSingle.getMaxId());
         v2spec.setSpecsJson(specsJson);
         v2spec.setSpecMapping(specMapping);
 

netflix-web/src/main/java/com/cyksj/web/controller/manage/group/CmsGroupRelationController.java

@@ -33,7 +33,7 @@ public class CmsGroupRelationController {
     @GetMapping("/get")
     public Result<SearchResult<GroupsRelationView>> get(){
         SearchResult<GroupsRelationView> search = beanSearcher.search(GroupsRelationView.class, MapUtils.flatBuilder(request.getParameterMap())
-                .field(GroupsRelationView::getStatus, GroupsRelation.Status.none).op(Operator.NotEqual).build()
+                .field(GroupsRelationView::getStatus, GroupsRelation.Status.none.toString()).op(Operator.NotEqual).build()
         );
         return GatewayResponse.SUCCESS.newBuilder().toResult(search);
     }

netflix-web/src/main/java/com/cyksj/web/controller/user/AddressController.java

@@ -0,0 +1,51 @@
+package com.cyksj.web.controller.user;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.cyksj.dto.Result;
+import com.cyksj.enums.GatewayResponse;
+import com.cyksj.model.entity.Address;
+import com.cyksj.service.user.AddressService;
+import com.cyksj.web.util.StpUserUtil;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author chan
+ * @date 2022/10/13 3:07 PM
+ */
+@RestController
+@RequestMapping("/applets/address")
+@RequiredArgsConstructor
+public class AddressController {
+
+    private final AddressService addressService;
+
+    @GetMapping("/get")
+    private Result<List<Address>> get(){
+        long userId = StpUserUtil.getLoginIdAsLong();
+        List<Address> addressList = addressService.list(Wrappers.lambdaQuery(Address.class).eq(Address::getUserId, userId));
+        return GatewayResponse.SUCCESS.newBuilder().toResult(addressList);
+    }
+
+    @PostMapping("/post")
+    private Result<Address> save(@RequestBody Address address){
+        addressService.save(address);
+        return GatewayResponse.SUCCESS.newBuilder().toResult(address);
+    }
+
+    @PutMapping("/update")
+    private Result<Address> update(@RequestBody Address address){
+        addressService.updateById(address);
+        return GatewayResponse.SUCCESS.newBuilder().toResult(address);
+    }
+
+    @DeleteMapping("/delete/{id}")
+    private Result<String> delete(@PathVariable Long id){
+        addressService.removeById(id);
+        return GatewayResponse.SUCCESS.newBuilder().toResult();
+    }
+
+
+}

netflix-web/src/main/java/com/cyksj/web/controller/user/AuthorizationController.java

@@ -164,5 +164,36 @@ public class AuthorizationController {
 
     }
 
+    //public Result<String> login(String phone, String code){
+    //
+    //    //
+    //    ////保存用户信息
+    //    //User user = userService.saveAuth(userinfo);
+    //    //
+    //    //
+    //    ////写回登陆信息
+    //    //StpUserUtil.login(user.getId());
+    //    //response.addHeader("satoken",StpUserUtil.getTokenValue());
+    //    //
+    //    //Cookie cookie = new Cookie("satoken",StpUserUtil.getTokenValue());
+    //    //cookie.setMaxAge(31536000);
+    //    //cookie.setPath("/");
+    //    //response.addCookie(cookie);
+    //    //JSONObject jsonObject = new JSONObject();
+    //    //jsonObject.putOpt("uid",user.getId());
+    //    //jsonObject.putOpt("nickName",user.getNickname());
+    //    //
+    //    //Cookie userInfo = new Cookie("info",Base64.encode(jsonObject.toString()));
+    //    //cookie.setMaxAge(31536000);
+    //    //cookie.setPath("/");
+    //    //response.addCookie(userInfo);
+    //    //
+    //    //String url = redisService.getStr(re.getMappingId().toString());
+    //    //redisService.del(re.getMappingId().toString());
+    //    //log.info("微信授权转跳.url: {}",url);
+    //    //response.sendRedirect(url);
+    //
+    //}
+
 
 }