From 11c5ab8d97809bdeddb60b22a4fe161a67aa3b05 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 19 一月 2026 16:03:17 +0800
Subject: [PATCH] 小程序 接口开发
---
server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/GoodsInfoResponse.java | 3
server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java | 2
server/dmmall_service/src/main/java/com/doumee/dao/web/request/goods/GoodsRequest.java | 2
server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java | 3
server/dmmall_service/src/main/java/com/doumee/dao/business/GoodsMapper.java | 9 ++
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java | 7 -
server/dmmall_service/src/main/java/com/doumee/service/business/IntegralService.java | 2
server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 34 ++++++++
server/dmmall_web/src/main/java/com/doumee/api/web/mall/GoodsApi.java | 4
server/dmmall_service/src/main/java/com/doumee/dao/web/response/MyCustomerResponse.java | 2
server/dmmall_service/src/main/java/com/doumee/service/business/ShopService.java | 2
server/dmmall_web/src/main/java/com/doumee/api/web/mall/IntegralApi.java | 3
server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java | 65 ++-------------
server/dmmall_web/src/main/java/com/doumee/api/web/ShopApi.java | 63 +++++++++++++++
14 files changed, 130 insertions(+), 71 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java b/server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java
index 844909d..88b1ebf 100644
--- a/server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -873,7 +873,7 @@
SHOP_ORDER(21,"娑堣垂杩旂Н鍒�","浼氬憳${param}浜ゆ槗鎴愬姛锛岃幏寰�${param1}绉垎",0,0),//${param}鏄电О-鎵嬫満鍙�
- SHOP_ORDER_CANCEL(22,"閫�鍗曟墸闄�","浜ゆ槗閫�娆鹃��鍥烇紝娑堣��100绉垎",0,0),
+ SHOP_ORDER_CANCEL(22,"璁㈠崟鍙栨秷閫�鍥�","璁㈠崟鍙栨秷閫�鍥烇紝閫�鍥�${param}绉垎",0,0),
SHOP_SYSTEM_RECHARGE(23,"绉垎鍙戞斁","骞冲彴濂栧姳锛岃幏寰�${param}绉垎",0,0),
SHOP_SYSTEM_DEDUCT(24,"绉垎鎵ｉ櫎","骞冲彴鎵ｅ噺锛屾秷鑰�${param}绉垎",0,0),
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/GoodsMapper.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/GoodsMapper.java
index 2a54f92..3fc71c4 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/GoodsMapper.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/GoodsMapper.java
@@ -34,4 +34,13 @@
" where g.ISDELETED = 0 and g.id = #{id} ")
GoodsInfoResponse getGoodsInfo(@Param("id") Integer id);
+
+ @Select(" select g.* , gs.price as minPrice " +
+ " ifnull( ( select sgr.PRICE from shop_goods_relation sgr where sgr.GOODS_SKU_ID = gs.ID and sgr.ISDELETED = 0 and sgr.`STATUS` = 0 and sgr.SHOP_ID = #{shopId} ) ,0) as exFactoryPrice " +
+ " ifnull(( select sum(gd.NAME) from goodsorder_detail gd inner join goodsorder go on gd.ORDER_ID = go.id where gd.GOODS_SKU_ID = gs.`id` and go.DISTRIBUTION_SHOP_ID = 1 ),0) as realSaleNum " +
+ " from goods g left join goods_sku gs on g.id = gs.GOODS_ID " +
+ " ${ew.customSqlSegment} ")
+ IPage<GoodsInfoResponse> goodsPageForShop(IPage<GoodsRequest> page, @Param(Constants.WRAPPER) Wrapper wrapper,@Param("shopId") Integer shopId);
+
+
}
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java
index 0d60570..44e732e 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java
@@ -205,6 +205,9 @@
@ApiModelProperty(value = "鏍搁攢鐮�", example = "1")
private String exchangeCode;
+ @ApiModelProperty(value = "璁㈠崟缁撶畻閲戦")
+ private BigDecimal shopSettlement;
+
@ApiModelProperty(value = "鏂囦欢鍦板潃")
@TableField(exist = false)
private String resourcePath;
@@ -265,9 +268,5 @@
@ApiModelProperty(value = "鏃ユ湡 ")
@TableField(exist = false)
private String everyDay;
-
- @ApiModelProperty(value = "璁㈠崟缁撶畻閲戦")
- @TableField(exist = false)
- private BigDecimal shopSettlement;
}
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/web/request/goods/GoodsRequest.java b/server/dmmall_service/src/main/java/com/doumee/dao/web/request/goods/GoodsRequest.java
index f37ed01..3b43cb9 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/web/request/goods/GoodsRequest.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/web/request/goods/GoodsRequest.java
@@ -40,6 +40,8 @@
@ApiModelProperty(value = "鎺掑簭鏂瑰紡锛�0=缁煎悎鎺掑簭锛�1=閿�閲忕敱浣庡埌楂� 锛�2=浠锋牸鐢变綆鍒伴珮锛�3=閿�閲忕敱楂樺埌浣庯紱4=浠锋牸鐢遍珮鍒颁綆")
private Integer sortInfo;
+ @ApiModelProperty(value = "缁忛攢鍟嗕富閿�")
+ private Integer shopId;
@ApiModelProperty(value = "涓�绾у垎绫荤紪鐮�")
private Integer parentCategoryId;
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/web/response/MyCustomerResponse.java b/server/dmmall_service/src/main/java/com/doumee/dao/web/response/MyCustomerResponse.java
index 9b78979..4d552c3 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/web/response/MyCustomerResponse.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/web/response/MyCustomerResponse.java
@@ -15,7 +15,7 @@
* @create 2023/3/23 9:50
*/
@Data
-@ApiModel("鎴戠殑瀹㈡埛璇锋眰绫�")
+@ApiModel("鎴戠殑瀹㈡埛杩斿洖绫�")
public class MyCustomerResponse {
@ApiModelProperty(value = "鐢ㄦ埛澶村儚")
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/GoodsInfoResponse.java b/server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/GoodsInfoResponse.java
index 2d6e375..188a90f 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/GoodsInfoResponse.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/GoodsInfoResponse.java
@@ -55,6 +55,9 @@
@ApiModelProperty(value = "鏈�浣庝环")
private BigDecimal minPrice;
+ @ApiModelProperty(value = "渚涜揣浠�")
+ private BigDecimal exFactoryPrice;
+
@ApiModelProperty(value = "鍟嗗搧璇︽儏")
private String content;
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/IntegralService.java b/server/dmmall_service/src/main/java/com/doumee/service/business/IntegralService.java
index 52028d5..fd6176f 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/IntegralService.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/IntegralService.java
@@ -147,7 +147,7 @@
PageData<Integral> findIntegralRecordPage(PageWrap<IntegralRecordDTO> pageWrap);
/**
- * 鑾峰彇鐢ㄦ埛鍓╀綑绉垎涓庡緟鎯呭喌绉垎淇℃伅
+ * 鑾峰彇鐢ㄦ埛鍓╀綑绉垎涓庡緟娓呯┖绉垎淇℃伅
* @param model
* @return
*/
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/ShopService.java b/server/dmmall_service/src/main/java/com/doumee/service/business/ShopService.java
index 21c700c..363448d 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/ShopService.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/ShopService.java
@@ -210,7 +210,7 @@
* @param shopId
* @return
*/
- SaleReportResponse saleReport(SaleReportRequest request, String shopId);
+ SaleReportResponse saleReport(SaleReportRequest request, Integer shopId);
String setGoodsPrice(Shop shop);
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
index 2d8af53..34a05c7 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
@@ -835,13 +835,11 @@
.eq("g.ISDELETED",Constants.ZERO)
.eq(!Objects.isNull(model) && Objects.nonNull(model.getCategoryId()),
"g.CATEGORY_ID", model.getCategoryId())
-
- //TODO 閫傜敤鍝佺墝 閫傜敤绯诲垪
-// .eq(!Objects.isNull(model) && Objects.nonNull(model.getApplicableBrandId()),
-// "","")
-// .eq(!Objects.isNull(model) && Objects.nonNull(model.getSeriesBrandId()),
-// "","")
-
+ //閫傜敤鍝佺墝 閫傜敤绯诲垪
+ .apply(!Objects.isNull(model) && Objects.nonNull(model.getApplicableBrandId()),
+ " find_in_set( '["+model.getApplicableBrandId()+"]' , g.BRAND_IDS ) ")
+ .apply(!Objects.isNull(model) && Objects.nonNull(model.getSeriesBrandId()),
+ " find_in_set( '["+model.getSeriesBrandId()+"]' , g.SERIAL_IDS ) ")
.eq("g.STATUS", Constants.ZERO)
.like(StringUtils.isNotBlank(model.getGoodsName()),"g.NAME",model.getGoodsName());
@@ -859,59 +857,16 @@
wrapper.orderByDesc("g.price");
}
}
-
-// for(PageWrap.SortData sortData:pageWrap.getSorts1()){
-// if ("CREATE_DATE".equalsIgnoreCase(sortData.getProperty())){
-// if (PageWrap.ASC.equalsIgnoreCase(sortData.getDirection())){
-// wrapper.orderByAsc("g.CREATE_DATE");
-// }
-// wrapper.orderByDesc("g.CREATE_DATE");
-//
-// }
-// if ("realSaleNum".equalsIgnoreCase(sortData.getProperty())){
-//
-// if (PageWrap.ASC.equalsIgnoreCase(sortData.getDirection())){
-// wrapper.orderByAsc("realSaleNum");
-// }
-// wrapper.orderByDesc("realSaleNum");
-// }
-// if ("PRICE".equalsIgnoreCase(sortData.getProperty())){
-// if (PageWrap.ASC.equalsIgnoreCase(sortData.getDirection())){
-// wrapper.orderByAsc("g.PRICE");
-// }
-// wrapper.orderByDesc("g.PRICE");
-// }
-//
-// }
-
- IPage<GoodsInfoResponse> page = goodsMapper.goodsPage(pageWrap.toPage(),wrapper);
+ IPage<GoodsInfoResponse> page =
+ Objects.isNull(model.getShopId())?
+ goodsMapper.goodsPage(pageWrap.toPage(),wrapper)
+ :
+ goodsMapper.goodsPageForShop(pageWrap.toPage(),wrapper,model.getShopId()) ;
if (!CollectionUtils.isEmpty(page.getRecords())){
String preFixPath = systemDictDataBiz.getPreFixPath(Constants.RESOURCE_PATH, Constants.GOODS_FILE);
page.getRecords().forEach(s->s.setImgurl(preFixPath+s.getImgurl()));
}
-
-
-// if (pageWrap.getModel().getType().equals(Constants.TWO)) {
-// for (GoodsInfoResponse goodsResponse : page.getRecords()) {
-// //鏌ヨ鍟嗗搧鐨勫垎绫�
-// goodsResponse.setCategoryLabels(labelsMapper.selectById(goodsResponse.getCategoryId()));
-// //鏌ヨ鍟嗗搧鐨勫搧鐗�
-// goodsResponse.setBrandLabels(labelsMapper.selectById(goodsResponse.getBrandId()));
-// //鏌ヨ鍟嗗搧鐨勬爣绛句俊鎭�
-// if (StringUtils.isNotBlank(goodsResponse.getLabels())) {
-// goodsResponse.setLabelsList(labelsMapper.selectList(new QueryWrapper<Labels>()
-// .apply(" find_in_set( id, " + goodsResponse.getLabels().split(",") + " ) ")));
-// }
-// //鏌ヨ鏄惁宸茶闃�
-// goodsResponse.setIsSubscribe(goodsorderDetailMapper.selectCount(new QueryWrapper<GoodsorderDetail>()
-// .eq("CREATOR", pageWrap.getModel().getMemberId())
-// .apply(" GOODS_SKU_ID in ( SELECT g.id FROM goods_sku g where g.GOODS_ID = " + goodsResponse.getId() + " ) ")
-// ));
-// //sku鍩虹淇℃伅
-// this.getSkuInfo(goodsResponse);
-// }
-// }
return page;
}
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
index a8a17a7..f2bb0e8 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -40,6 +40,7 @@
import com.github.binarywang.wxpay.exception.WxPayException;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import okhttp3.Address;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.checkerframework.checker.units.qual.C;
@@ -97,6 +98,9 @@
private ShopMapper shopMapper;
@Autowired
+ private LabelsMapper labelsMapper;
+
+ @Autowired
private ShopGoodsRelationMapper relationMapper;
@Autowired
@@ -137,6 +141,9 @@
@Autowired
private AreasService areasService;
+
+ @Autowired
+ private AreasMapper areasMapper;
@Autowired
private GoodsorderDetailJoinMapper goodsorderDetailJoinMapper;
@@ -1064,7 +1071,6 @@
member.setImgFullUrl(memberfullUrl + member.getImgurl());
memberOrderResponse.setMember(member);
}
-
return memberOrderResponse;
}
@@ -1384,7 +1390,33 @@
//閭垂閲戦
if(Objects.nonNull(request.getReceiveType())){
if(Constants.equalsInteger(request.getReceiveType(),Constants.ZERO)){
+ if(Objects.nonNull(request.getAddressId())){
+ Addr addr = addrMapper.selectById(request.getAddressId());
+ if(Objects.isNull(addr)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鏀惰揣鍦板潃淇℃伅");
+ }
+ Areas areas = areasMapper.selectOne(new QueryWrapper<Areas>().lambda()
+ .eq(Areas::getIsdeleted,Constants.ZERO)
+ .eq(Areas::getId,StringUtils.leftPad(addr.getAreaId().toString().substring(0,2),6,"0"))
+ .isNotNull(Areas::getYunFeeId)
+ .last(" limit 1 ")
+ );
+ if(Objects.nonNull(areas)){
+ Labels labels = labelsMapper.selectById(areas.getYunFeeId());
+
+
+ }
+
+
+
+ }
+
+
+
//TODO 鏍规嵁鏀惰揣鍦板潃 鏌ヨ杩愯垂閰嶇疆
+
+
+
//璁＄畻鍟嗗搧淇℃伅鎬婚噸閲�
BigDecimal totalWeight = goodsCalculateList.stream().map(i->
i.getWeight().multiply(new BigDecimal(i.getGoodsNum().toString()))
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
index d468a1c..1ced986 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
@@ -803,7 +803,7 @@
@Override
- public SaleReportResponse saleReport(SaleReportRequest request,String shopId){
+ public SaleReportResponse saleReport(SaleReportRequest request,Integer shopId){
SaleReportResponse saleReportResponse = new SaleReportResponse();
saleReportResponse.setSaleTotal(BigDecimal.ZERO);
saleReportResponse.setOrderNum(Constants.ZERO);
@@ -814,7 +814,6 @@
.selectAll(Goodsorder.class)
.selectAs(Member::getPhone,Goodsorder::getPhone)
.selectAs(Member::getNickname,Goodsorder::getNickName)
- .select(" select ifnull(sum(g.SHOP_SETTLEMENT),0) from goodsorder_detail g where t.id = g.ORDER_ID ",Goodsorder::getShopSettlement)
.leftJoin(Member.class,Member::getId,Goodsorder::getMemberId)
.eq(Goodsorder::getIsdeleted,Constants.ZERO)
.eq(Goodsorder::getDistributionShopId,shopId)
diff --git a/server/dmmall_web/src/main/java/com/doumee/api/web/ShopApi.java b/server/dmmall_web/src/main/java/com/doumee/api/web/ShopApi.java
index 3e1fc59..a4c3ce0 100644
--- a/server/dmmall_web/src/main/java/com/doumee/api/web/ShopApi.java
+++ b/server/dmmall_web/src/main/java/com/doumee/api/web/ShopApi.java
@@ -8,8 +8,15 @@
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Shop;
import com.doumee.dao.business.model.WithdrawRecord;
+import com.doumee.dao.web.dto.ShopLoginDTO;
import com.doumee.dao.web.dto.shop.*;
+import com.doumee.dao.web.request.MyCustomerRequest;
+import com.doumee.dao.web.request.SaleReportRequest;
import com.doumee.dao.web.request.WithdrawApplyRequest;
+import com.doumee.dao.web.response.AccountResponse;
+import com.doumee.dao.web.response.MyCustomerResponse;
+import com.doumee.dao.web.response.SaleReportResponse;
+import com.doumee.dao.web.response.ShopInfoResponse;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -94,7 +101,7 @@
@LoginShopRequired
- @ApiOperation(value = "鎻愮幇鐢宠 - 缁忛攢鍟�", notes = "灏忕▼搴忕")
+ @ApiOperation(value = "缁忛攢鍟� - 鎻愮幇鐢宠", notes = "灏忕▼搴忕")
@PostMapping("/withdrawApply")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
@@ -108,7 +115,7 @@
@LoginShopRequired
- @ApiOperation("鏌ヨ鎻愮幇鐢宠璇︽儏")
+ @ApiOperation("缁忛攢鍟� - 鏌ヨ鎻愮幇鐢宠璇︽儏")
@GetMapping("/withdrawDetail")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
@@ -118,6 +125,58 @@
}
+ @ApiOperation("缁忛攢鍟� - 璐﹀彿瀵嗙爜鐧诲綍")
+ @PostMapping("/shopPasswordLogin")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ })
+ public ApiResponse<AccountResponse> shopPasswordLogin(@RequestBody ShopLoginDTO dto) {
+ return ApiResponse.success(shopService.shopPasswordLogin(dto));
+ }
+
+ @ApiOperation("缁忛攢鍟� - 闈欓粯鐧诲綍")
+ @PostMapping("/shopOpenidLogin")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ })
+ public ApiResponse<AccountResponse> shopOpenidLogin(@RequestBody ShopLoginDTO dto) {
+ return ApiResponse.success(shopService.shopOpenidLogin(dto));
+ }
+
+ @LoginShopRequired
+ @ApiOperation("缁忛攢鍟� - 搴楅摵璇︽儏")
+ @GetMapping("/getShopInfo")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ })
+ public ApiResponse<ShopInfoResponse> getShopInfo() {
+ return ApiResponse.success(shopService.getShopInfo(getShopId()));
+ }
+
+
+ @LoginShopRequired
+ @ApiOperation("缁忛攢鍟� - 鎴戠殑瀹㈡埛淇℃伅")
+ @GetMapping("/myCustomer")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ })
+ public ApiResponse<List<MyCustomerResponse>> myCustomer(MyCustomerRequest request) {
+ return ApiResponse.success(shopService.myCustomer(request,getShopId()));
+ }
+
+ @LoginShopRequired
+ @ApiOperation("缁忛攢鍟� - 閿�鍞槑缁�")
+ @GetMapping("/saleReport")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ })
+ public ApiResponse<SaleReportResponse> saleReport(SaleReportRequest request) {
+ return ApiResponse.success(shopService.saleReport(request,getShopId()));
+ }
+
+
+
+
}
diff --git a/server/dmmall_web/src/main/java/com/doumee/api/web/mall/GoodsApi.java b/server/dmmall_web/src/main/java/com/doumee/api/web/mall/GoodsApi.java
index 92e12c5..5ee0dfc 100644
--- a/server/dmmall_web/src/main/java/com/doumee/api/web/mall/GoodsApi.java
+++ b/server/dmmall_web/src/main/java/com/doumee/api/web/mall/GoodsApi.java
@@ -27,7 +27,8 @@
@RequestMapping("/web/goods")
@Slf4j
public class GoodsApi extends ApiController {
-// @LoginRequired
+
+
@ApiOperation("鍟嗗搧鍒楄〃")
@PostMapping("/goodsPage")
@ApiImplicitParams({
@@ -38,7 +39,6 @@
return ApiResponse.success("鏌ヨ鎴愬姛",page);
}
-// @LoginRequired
@ApiOperation("鍟嗗搧璇︽儏")
@GetMapping("/goodsInfo")
@ApiImplicitParams({
diff --git a/server/dmmall_web/src/main/java/com/doumee/api/web/mall/IntegralApi.java b/server/dmmall_web/src/main/java/com/doumee/api/web/mall/IntegralApi.java
index 3a55d80..f1f1e2a 100644
--- a/server/dmmall_web/src/main/java/com/doumee/api/web/mall/IntegralApi.java
+++ b/server/dmmall_web/src/main/java/com/doumee/api/web/mall/IntegralApi.java
@@ -43,8 +43,9 @@
return ApiResponse.success(integralService.findIntegralRecordPage(pageWrap));
}
+
@LoginRequired
- @ApiOperation("鑾峰彇鐢ㄦ埛鍓╀綑绉垎涓庡緟鎯呭喌绉垎淇℃伅")
+ @ApiOperation("鑾峰彇鐢ㄦ埛鍓╀綑绉垎涓庡緟娓呯┖绉垎淇℃伅")
@PostMapping("/getIntegralData")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
--
Gitblit v1.9.3