增加小程序接口，OSS配置

08.src/Xingxi/xingxi-admin/src/main/resources/application-local.yml

@@ -71,9 +71,9 @@ idworkcfg:
     dataCenterId: "2"
 aliyun:
     oss:
-        endPoint: oss-cn-shanghai.aliyuncs.com
-        accessKeyID: LTAI5tRgA62ZTMXFuRBRrTkz
-        accessKeySecret: m3zP8XD78dgkV5sMGhnuq7xObuMvuN
-        bucketName: empress
+        endPoint: oss-cn-beijing.aliyuncs.com
+        accessKeyID: LTAI5tMiMyyya41eaFJ8vcoU
+        accessKeySecret: kAIazWRGoz1ird2ynzwgcwWzM9vMCu
+        bucketName: bucket-gululuq
         # 如果有自定义域名
-        customDomain: res.ysyd.cloud
+        customDomain: res.gululuq.com

08.src/Xingxi/xingxi-common/src/main/java/com/xingxi/common/enums/EYesNo.java

@@ -0,0 +1,30 @@
+package com.xingxi.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @program: biandan
+ * @description: 是否标志
+ * @author: bao
+ * @create: 2022-02-14
+ */
+@AllArgsConstructor
+@Getter
+public enum EYesNo {
+    YES("1", "是"),
+    NO("0", "否");
+
+    private String val;
+    private String desc;
+
+    /** 解析 */
+    public static EYesNo parseByVal(String val) {
+        for(EYesNo type : EYesNo.values()) {
+            if(type.getVal().equalsIgnoreCase(val)) {
+                return type;
+            }
+        }
+        return EYesNo.NO;
+    }
+}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/controller/CartsApiController.java

@@ -0,0 +1,51 @@
+package com.xingxi.api.controller;
+
+import com.xingxi.api.common.BaseApiController;
+import com.xingxi.api.model.CartsRequest;
+import com.xingxi.api.model.CartsResponse;
+import com.xingxi.api.service.CartsServiceI;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+@Slf4j
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/carts")
+public class CartsApiController extends BaseApiController {
+
+    private final CartsServiceI cartsService;
+
+    @GetMapping("/list")
+    public CartsResponse list(CartsRequest request){
+        return cartsService.list(getUserContext(), request);
+    }
+
+    @PostMapping("/add")
+    public CartsResponse add(@RequestBody @Valid CartsRequest request){
+        return cartsService.add(getUserContext(),  request);
+    }
+
+    @PostMapping("/checked")
+    public CartsResponse checked(@RequestBody @Valid CartsRequest request){
+        return cartsService.checked(getUserContext(), request);
+    }
+
+    @PostMapping("/checkedAll")
+    public CartsResponse checkedAll(@RequestBody @Valid CartsRequest request){
+        return cartsService.checkedAll(getUserContext(), request);
+    }
+
+    @PostMapping("/uncheckedAll")
+    public CartsResponse uncheckedAll(@RequestBody @Valid CartsRequest request){
+        return cartsService.uncheckedAll(getUserContext(),  request);
+    }
+
+    @PostMapping("/delete")
+    public CartsResponse delete(@Valid @RequestBody CartsRequest request){
+        return cartsService.delete(getUserContext(),  request);
+    }
+
+}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/controller/HomepageApiController.java

@@ -0,0 +1,136 @@
+package com.xingxi.api.controller;
+
+import com.xingxi.api.common.BaseApiController;
+import com.xingxi.api.model.*;
+import com.xingxi.business.Banner.domain.Banner;
+import com.xingxi.business.Banner.service.IBannerService;
+import com.xingxi.business.NewProd.domain.NewProd;
+import com.xingxi.business.NewProd.service.INewProdService;
+import com.xingxi.business.PopularProd.domain.PopularProd;
+import com.xingxi.business.PopularProd.service.IPopularProdService;
+import com.xingxi.business.SuggestProd.domain.SuggestProd;
+import com.xingxi.business.SuggestProd.service.ISuggestProdService;
+import com.xingxi.common.enums.EDelFlag;
+import com.xingxi.master.ipInfo.domain.IpInfo;
+import com.xingxi.master.ipInfo.service.IIpInfoService;
+import com.xingxi.master.product.domain.Prod;
+import com.xingxi.master.product.domain.ProdClass;
+import com.xingxi.master.product.service.IProdClassService;
+import com.xingxi.master.product.service.IProdService;
+import com.xingxi.system.service.ISysConfigService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
+
+@Slf4j
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/homepage")
+public class HomepageApiController extends BaseApiController {
+
+    @Autowired
+    private IBannerService bannerService;
+    @Autowired
+    private IIpInfoService ipInfoService;
+    @Autowired
+    private ISysConfigService configService;
+    @Autowired
+    private IProdClassService prodClassService;
+
+    @Autowired
+    private IPopularProdService leftProdService;
+    @Autowired
+    private ISuggestProdService middleProdService;
+    @Autowired
+    private INewProdService rightProdService;
+
+    @Autowired
+    private IProdService prodService;
+
+    @GetMapping("/banners")
+    public BannerResponse getBanners(){
+        Banner cond = new Banner();
+        cond.setDelFlag(EDelFlag.NO.getVal());
+
+        return new BannerResponse(bannerService.selectBannerList(cond));
+    }
+
+    @GetMapping("/ipInfos")
+    public IpInfoResponse getIpInfos(){
+
+        IpInfo cond = new IpInfo();
+        cond.setDelFlag(EDelFlag.NO.getVal());
+
+        return new IpInfoResponse(ipInfoService.selectIpInfoList(cond));
+    }
+
+    @GetMapping("/titles")
+    public SysConfigResponse getTitles(){
+
+        List<String> rtn = new ArrayList<>();
+
+        // TODO title的key待确认，数据库中未创建数据
+        rtn.add(configService.selectConfigByKey("title.left"));
+        rtn.add(configService.selectConfigByKey("title.middle"));
+        rtn.add(configService.selectConfigByKey("title.right"));
+
+        return new SysConfigResponse(rtn);
+    }
+
+    @GetMapping("/leftProds")
+    public LeftProdResponse getLeftProds(){
+
+        PopularProd cond = new PopularProd();
+        cond.setDelFlag(EDelFlag.NO.getVal());
+
+        return new LeftProdResponse(leftProdService.selectPopularProdList(cond));
+    }
+
+    @GetMapping("/middleProds")
+    public MiddleProdResponse getMiddleProds(){
+
+        SuggestProd cond = new SuggestProd();
+        cond.setDelFlag(EDelFlag.NO.getVal());
+
+        return new MiddleProdResponse(middleProdService.selectSuggestProdList(cond));
+    }
+
+    @GetMapping("/rightProds")
+    public RightProdResponse getRightProds(){
+
+        NewProd cond = new NewProd();
+        cond.setDelFlag(EDelFlag.NO.getVal());
+
+        return new RightProdResponse(rightProdService.selectNewProdList(cond));
+    }
+
+    @GetMapping("/prodClasses")
+    public ProdClassResponse getProdClasses(){
+
+        ProdClass cond = new ProdClass();
+        cond.setDelFlag(EDelFlag.NO.getVal());
+
+        return new ProdClassResponse(prodClassService.selectProdClassList(cond));
+    }
+
+    @PostMapping("/prods")
+    public ProdListResponse getProdList(@Valid @RequestBody ProdRequest request) {
+        Prod cond = new Prod();
+        cond.setId(request.getId());
+        cond.setIpId(request.getIpId());
+        cond.setProdClassId(request.getProdClassId());
+        cond.setProdName(request.getProdName());
+        cond.setDelFlag(EDelFlag.NO.getVal());
+
+        return new ProdListResponse(prodService.selectProdList(cond));
+    }
+
+
+
+
+}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/BannerResponse.java

@@ -0,0 +1,15 @@
+package com.xingxi.api.model;
+
+import com.xingxi.business.Banner.domain.Banner;
+import lombok.Data;
+import lombok.Value;
+
+import java.util.List;
+
+@Data
+@Value
+public class BannerResponse {
+
+    List<Banner> bannerList;
+
+}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/CartsRequest.java

@@ -0,0 +1,18 @@
+package com.xingxi.api.model;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+public class CartsRequest {
+
+    @NotNull
+    private Long prodId;
+    @NotNull
+    private Long prodAttrId;
+    @NotNull
+    private Integer count;
+}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/CartsResponse.java

@@ -0,0 +1,11 @@
+package com.xingxi.api.model;
+
+import com.xingxi.business.Carts.domain.Carts;
+import lombok.Value;
+
+import java.util.List;
+
+@Value
+public class CartsResponse {
+    List<Carts> carts;
+}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/IpInfoResponse.java

@@ -0,0 +1,15 @@
+package com.xingxi.api.model;
+
+import com.xingxi.master.ipInfo.domain.IpInfo;
+import lombok.Data;
+import lombok.Value;
+
+import java.util.List;
+
+@Data
+@Value
+public class IpInfoResponse {
+
+    List<IpInfo> ipInfoList;
+
+}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/LeftProdResponse.java

@@ -0,0 +1,15 @@
+package com.xingxi.api.model;
+
+import com.xingxi.business.PopularProd.domain.PopularProd;
+import lombok.Data;
+import lombok.Value;
+
+import java.util.List;
+
+@Data
+@Value
+public class LeftProdResponse {
+
+    List<PopularProd> prodList;
+
+}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/MiddleProdResponse.java

@@ -0,0 +1,15 @@
+package com.xingxi.api.model;
+
+import com.xingxi.business.SuggestProd.domain.SuggestProd;
+import lombok.Data;
+import lombok.Value;
+
+import java.util.List;
+
+@Data
+@Value
+public class MiddleProdResponse {
+
+    List<SuggestProd> prodList;
+
+}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/ProdClassResponse.java

@@ -0,0 +1,15 @@
+package com.xingxi.api.model;
+
+import com.xingxi.master.product.domain.ProdClass;
+import lombok.Data;
+import lombok.Value;
+
+import java.util.List;
+
+@Data
+@Value
+public class ProdClassResponse {
+
+    List<ProdClass> prodClassList;
+
+}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/ProdListResponse.java

@@ -0,0 +1,15 @@
+package com.xingxi.api.model;
+
+import com.xingxi.master.product.domain.Prod;
+import lombok.Data;
+import lombok.Value;
+
+import java.util.List;
+
+@Data
+@Value
+public class ProdListResponse {
+
+    List<Prod> prodList;
+
+}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/ProdRequest.java

@@ -0,0 +1,21 @@
+package com.xingxi.api.model;
+
+import lombok.Data;
+
+@Data
+public class ProdRequest {
+
+    // 主键
+    private Long id;
+
+    // 商品分类ID
+    private Long prodClassId;
+
+    // IPID
+    private Long ipId;
+
+    // 商品名称
+    private String prodName;
+
+
+}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/RightProdResponse.java

@@ -0,0 +1,15 @@
+package com.xingxi.api.model;
+
+import com.xingxi.business.NewProd.domain.NewProd;
+import lombok.Data;
+import lombok.Value;
+
+import java.util.List;
+
+@Data
+@Value
+public class RightProdResponse {
+
+    List<NewProd> prodList;
+
+}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/SysConfigResponse.java

@@ -0,0 +1,14 @@
+package com.xingxi.api.model;
+
+import lombok.Data;
+import lombok.Value;
+
+import java.util.List;
+
+@Data
+@Value
+public class SysConfigResponse {
+
+    List<String> titleList;
+
+}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/service/CartsServiceI.java

@@ -0,0 +1,20 @@
+package com.xingxi.api.service;
+
+import com.xingxi.api.common.UserContext;
+import com.xingxi.api.model.*;
+
+public interface CartsServiceI {
+
+    CartsResponse add(UserContext userContext, CartsRequest request);
+
+    CartsResponse list(UserContext userContext, CartsRequest request);
+
+    CartsResponse checked(UserContext userContext, CartsRequest request);
+
+    CartsResponse checkedAll(UserContext userContext, CartsRequest request);
+
+    CartsResponse uncheckedAll(UserContext userContext, CartsRequest request);
+
+    CartsResponse delete(UserContext userContext, CartsRequest request);
+
+}

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/service/impl/CartsServiceImpl.java

@@ -0,0 +1,94 @@
+package com.xingxi.api.service.impl;
+
+import com.xingxi.api.common.UserContext;
+import com.xingxi.api.model.CartsRequest;
+import com.xingxi.api.model.CartsResponse;
+import com.xingxi.api.service.CartsServiceI;
+import com.xingxi.business.Carts.domain.Carts;
+import com.xingxi.business.Carts.mapper.CartsMapper;
+import com.xingxi.common.core.domain.entity.SysUser;
+import com.xingxi.common.enums.EDelFlag;
+import com.xingxi.common.enums.EYesNo;
+import com.xingxi.common.utils.StringUtils;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.List;
+
+@Slf4j
+@RequiredArgsConstructor
+@Service
+@Validated
+class CartsServiceImpl implements CartsServiceI {
+
+    @Autowired
+    CartsMapper cartsMapper;
+
+    @Override
+    public CartsResponse add(UserContext userContext, CartsRequest request) {
+
+        SysUser currentUser = userContext.getCurrentUser();
+        Long userId = currentUser.getUserId();
+
+        Carts cond = new Carts();
+        cond.setUserId(userId);
+        cond.setProdId(request.getProdId());
+        cond.setProdAttrId(request.getProdAttrId());
+        cond.setDelFlag(EDelFlag.NO.getVal());
+
+        List<Carts> exiCarts = cartsMapper.selectCartsList(cond);
+
+        Carts carts = new Carts();
+
+        if (StringUtils.isEmpty(exiCarts)) {
+            carts.setUserId(userId);
+            carts.setProdId(request.getProdId());
+            carts.setProdAttrId(request.getProdAttrId());
+            carts.setQuantity(1);
+            carts.setDelFlag(EDelFlag.NO.getVal());
+            carts.setCheckFlag(EYesNo.YES.getVal());
+
+            cartsMapper.insertCarts(carts);
+        }
+
+        return null;
+    }
+
+    @Override
+    public CartsResponse list(UserContext userContext, CartsRequest request) {
+
+        SysUser currentUser = userContext.getCurrentUser();
+        Long userId = currentUser.getUserId();
+
+        Carts cond = new Carts();
+        cond.setUserId(userId);
+        cond.setDelFlag(EDelFlag.NO.getVal());
+
+        List<Carts> exiCarts = cartsMapper.selectCartsList(cond);
+
+        return new CartsResponse(exiCarts);
+    }
+
+    @Override
+    public CartsResponse checked(UserContext userContext, CartsRequest request) {
+        return null;
+    }
+
+    @Override
+    public CartsResponse checkedAll(UserContext userContext, CartsRequest request) {
+        return null;
+    }
+
+    @Override
+    public CartsResponse uncheckedAll(UserContext userContext, CartsRequest request) {
+        return null;
+    }
+
+    @Override
+    public CartsResponse delete(UserContext userContext, CartsRequest request) {
+        return null;
+    }
+}

08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/application.yml

@@ -30,10 +30,10 @@ pagehelper:
 
 aliyun:
   oss:
-    endPoint: oss-cn-shanghai.aliyuncs.com
-    accessKeyID: LTAI5tRgA62ZTMXFuRBRrTkz
-    accessKeySecret: m3zP8XD78dgkV5sMGhnuq7xObuMvuN
-    bucketName: empress
+    endPoint: oss-cn-beijing.aliyuncs.com
+    accessKeyID: LTAI5tMiMyyya41eaFJ8vcoU
+    accessKeySecret: kAIazWRGoz1ird2ynzwgcwWzM9vMCu
+    bucketName: bucket-gululuq
     # 如果有自定义域名
-    customDomain: res.ysyd.cloud
+    customDomain: res.gululuq.com
 

08.src/Xingxi/xingxi-mq-server/src/main/resources/config/application.yml

@@ -59,9 +59,9 @@ wx:
 
 aliyun:
   oss:
-    endPoint: oss-cn-shanghai.aliyuncs.com
-    accessKeyID: LTAI5tRgA62ZTMXFuRBRrTkz
-    accessKeySecret: m3zP8XD78dgkV5sMGhnuq7xObuMvuN
-    bucketName: empress
+    endPoint: oss-cn-beijing.aliyuncs.com
+    accessKeyID: LTAI5tMiMyyya41eaFJ8vcoU
+    accessKeySecret: kAIazWRGoz1ird2ynzwgcwWzM9vMCu
+    bucketName: bucket-gululuq
     # 如果有自定义域名
-    customDomain: res.ysyd.cloud
+    customDomain: res.gululuq.com

08.src/Xingxi/xingxi-system/src/main/java/com/xingxi/business/Carts/domain/Carts.java

@@ -23,11 +23,7 @@ public class Carts extends BaseEntity {
 
     // 用户ID
     @Excel(name = "用户ID")
-    private String userId;
-
-    // 店铺ID
-    @Excel(name = "店铺ID")
-    private Long mercId;
+    private Long userId;
 
     // 商品ID
     @Excel(name = "商品ID")
@@ -39,7 +35,7 @@ public class Carts extends BaseEntity {
 
     // 数量
     @Excel(name = "数量")
-    private Long quantity;
+    private Integer quantity;
 
     // 是否选中
     @Excel(name = "是否选中")