springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopFundsExportDTO.java
@@ -27,7 +27,7 @@ @ApiModelProperty(value = "支付时间-结束",example = "2021-04-18 19:59:14") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date payTimeEnd; @ApiModelProperty(value = "订单ID", notes = "如果指定了订单ID，其它搜索条件将被忽略，只导出指定订单") @ApiModelProperty(value = "订单ID-如果指定了订单ID，只导出指定订单，其它搜索条件将被忽略", notes = "如果指定了订单ID，其它搜索条件将被忽略，只导出指定订单") private Long[] orderIds; @JsonIgnore private Long userId; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderExportDTO.java
@@ -37,7 +37,7 @@ @ApiModelProperty(value = "下单时间-结束",example = "2021-04-18 19:58:54") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAtEnd; @ApiModelProperty(value = "订单ID", notes = "如果指定了订单ID，其它搜索条件将被忽略，只导出指定订单") @ApiModelProperty(value = "订单ID-如果指定了订单ID，只导出指定订单，其它搜索条件将被忽略", notes = "") private Long[] orderIds; @JsonIgnore private Long userId; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopOrderSearchDTO.java
@@ -31,10 +31,10 @@ private String storeName; @ApiModelProperty(value = "订单状态(1.待付款 2.代发货 3.待收货 4.待评价 5.已完成 6.已取消)",example = "1") private Integer status; @ApiModelProperty(value = "下单时间-开始",example = "1") @ApiModelProperty(value = "下单时间-开始",example = "2021-4-10 10:38:25") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private String createAtStart; @ApiModelProperty(value = "下单时间-结束",example = "1") @ApiModelProperty(value = "下单时间-结束",example = "2021-4-20 10:38:29") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAtEnd; @ApiModelProperty(value = "分页-当前页数",example = "1", required = true) springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/GoodsApi.java
@@ -4,6 +4,8 @@ import com.panzhihua.common.model.dtos.shop.ComShopGoodsDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.shop.AddShopGoodsVO; import com.panzhihua.common.model.vos.shop.ComShopGoodsVO; import com.panzhihua.common.model.vos.shop.ComShopOrderSearchVO; import com.panzhihua.common.model.vos.shop.ShopStoreVO; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.validated.PageGroup; @@ -33,11 +35,14 @@ @Resource private CommunityService communityService; @ApiOperation(value = "商品分页搜索") @ApiOperation(value = "商品分页搜索", response = ComShopGoodsVO.class) @PostMapping("/page") public R search(@RequestBody @Validated(PageGroup.class) ComShopGoodsDTO comShopGoodsDTO){ R<ShopStoreVO> storeInofR = communityService.getUserStoreInfo(getUserId()); ShopStoreVO shopStoreVO = storeInofR.getData(); R<ShopStoreVO> storeInfoR = communityService.getUserStoreInfo(getUserId()); ShopStoreVO shopStoreVO = storeInfoR.getData(); if(shopStoreVO==null){ return R.fail("用户无关联店铺"); } comShopGoodsDTO.setStoreId(shopStoreVO.getId()); return communityService.pageShopGoods(comShopGoodsDTO); } springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/OrderApi.java
@@ -11,6 +11,7 @@ import com.panzhihua.common.model.vos.R; import com.panzhihua.common.interfaces.ShopOperLog; import com.panzhihua.common.model.vos.shop.ComShopOrderPageVO; import com.panzhihua.common.model.vos.shop.ComShopOrderSearchVO; import com.panzhihua.common.model.vos.shop.ShopStoreVO; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.utlis.SFTPUtil; @@ -65,7 +66,7 @@ @Value("${ftp.port}") private int port; @ApiOperation(value = "订单分页") @ApiOperation(value = "订单分页", response = ComShopOrderSearchVO.class) @PostMapping("") public R page(@RequestBody @Validated PageComShopOrderSearchDTO pageComShopOrderSearchDTO){ pageComShopOrderSearchDTO.setUserId(this.getUserId());
