springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ShopApi.java
@@ -222,8 +222,10 @@ public R export(@RequestBody ComShopOrderExportDTO comShopOrderExportDTO) { ClazzUtils.setIfStringIsEmpty(comShopOrderExportDTO); String url = excelUrl; String uuid = UUID.randomUUID().toString().replace("-", ""); //String name=uuid+".xlsx"; String ftpUrl = "/mnt/data/web/excel/"; R r = communityService.shopOrderExportData(comShopOrderExportDTO); if (R.isOk(r)) { List<ExcelShopOrderDTO> excelShopOrderDTO = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ExcelShopOrderDTO.class); @@ -233,7 +235,7 @@ try { SFTPUtil sftp = new SFTPUtil(userName, password, host, port); sftp.login(); String name = "商城订单-" + new SimpleDateFormat("yyyyMMddhhmmss").format(new Date()) + ".xlsx"; String name = "商城订单-" + new SimpleDateFormat("yyyyMMddhhmmss").format(new Date()) + ".xlsx"; boolean existDir = sftp.isExistDir(ftpUrl + name); if (!existDir) { String property = System.getProperty("user.dir"); @@ -243,7 +245,7 @@ InputStream inputStream = null; try { excelWriter = EasyExcel.write(fileName, ExcelShopOrderDTO.class).registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).registerWriteHandler(new CustomSheetWriteHandler()).build(); WriteSheet writeSheet = EasyExcel.writerSheet( "商家订单").build(); WriteSheet writeSheet = EasyExcel.writerSheet("订单").build(); excelWriter.write(excelShopOrderDTO, writeSheet); excelWriter.finish(); File file = new File(fileName); @@ -303,8 +305,12 @@ public R export(@RequestBody ComShopFundsExportDTO comShopFundsExportDTO) { ClazzUtils.setIfStringIsEmpty(comShopFundsExportDTO); String url = excelUrl; String uuid = UUID.randomUUID().toString().replace("-", ""); //String name=uuid+".xlsx"; String ftpUrl = "/mnt/data/web/excel/"; Long userId = this.getUserId(); comShopFundsExportDTO.setUserId(userId); R r = communityService.shopOrderFundsExportData(comShopFundsExportDTO); if (R.isOk(r)) { List<ExcelShopFundsDTO> excelShopFundsDTO = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ExcelShopFundsDTO.class); @@ -354,4 +360,11 @@ } return R.fail("导出数据失败"); } @ApiOperation(value = "配送完成") @PutMapping("/order/finishDeliver") public R finishDeliver(@RequestBody ComShopOrderDeliverDTO deliverDTO){ return communityService.finishDeliverOrder(deliverDTO); } } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderDeliverDTO.java
@@ -15,10 +15,8 @@ * @Version 1.0 **/ @Data @ApiModel("订单发货信息") @ApiModel("订单配送信息") public class ComShopOrderDeliverDTO { @ApiModelProperty(value = "订单号") private String orderNo; @ApiModelProperty(value = "订单ID") private Long orderId; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOrderDAO.java
@@ -232,7 +232,7 @@ "<if test='pageComShopFundsSearchDTO.orderNo != null '>" + " AND sr.order_no = #{pageComShopFundsSearchDTO.orderNo} " + " </if> " + " GROUP BY sr.id ORDER BY sr.create_at "+ " GROUP BY sr.id ORDER BY sr.create_at DESC "+ "</script>") IPage<ComShopFundsOrderVO> pageShopFunds(Page page, @Param("pageComShopFundsSearchDTO") PageComShopFundsSearchDTO pageComShopFundsSearchDTO);
@@ -612,6 +612,10 @@ if(!(comShopOrderDO.getDeliveryStatus() == 4)){ return R.fail("订单还未开始配送"); } if(!(comShopOrderDO.getStatus() == 3)){ return R.fail("订单还未发货"); } comShopOrderDO.setStatus(4); comShopOrderDO.setDeliveryStatus(5); int updated = comShopOrderDAO.updateById(comShopOrderDO); if(updated==1){ @@ -623,7 +627,7 @@ @Override public R shopOrderExportData(ComShopOrderExportDTO comShopOrderExportDTO) { Page page = new Page(); page.setSize(1000); page.setSize(10000); page.setCurrent(1); IPage<ExcelShopOrderDTO> excelShopOrderDTO = comShopOrderDAO.selectOrderExport(page, comShopOrderExportDTO); return R.ok(excelShopOrderDTO.getRecords()); @@ -632,7 +636,7 @@ @Override public R shopOrderFundsExportData(ComShopFundsExportDTO comShopFundsExportDTO) { Page page = new Page(); page.setSize(1000); page.setSize(10000); page.setCurrent(1); IPage<ExcelShopFundsDTO> excelShopFundsDTO = comShopOrderDAO.selectFundsExport(page, comShopFundsExportDTO); return R.ok(excelShopFundsDTO.getRecords()); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopStoreServiceImpl.java
@@ -201,7 +201,7 @@ public R getOneInfo(Long id) { ComShopStoreDO comShopStoreDO = this.baseMapper.selectById(id); if (comShopStoreDO == null) { R.fail(500, "商铺不存在"); return R.fail(500, "商铺不存在"); } ShopStoreVO shopStoreVO = new ShopStoreVO(); BeanUtils.copyProperties(comShopStoreDO, shopStoreVO); @@ -212,7 +212,7 @@ public R getUserStoreInfo(Long userId) { ComShopStoreDO comShopStoreDO = this.baseMapper.selectOne(new LambdaQueryWrapper<ComShopStoreDO>().eq(ComShopStoreDO::getDeleteStatus, 1).eq(ComShopStoreDO::getSysUserId, userId)); if (comShopStoreDO == null) { R.fail(500, "商铺不存在"); return R.fail(500, "商铺不存在"); } ShopStoreVO shopStoreVO = new ShopStoreVO(); BeanUtils.copyProperties(comShopStoreDO, shopStoreVO); springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/LoginApi.java
@@ -2,6 +2,7 @@ import com.alibaba.fastjson.JSONObject; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.vos.LoginReturnVO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.shop.LoginStoreUserInfoVO; @@ -34,7 +35,7 @@ @Resource private CommunityService communityService; @ApiOperation(value = "商家后台登录") @ApiOperation(value = "商家后台登录", response = LoginReturnVO.class) @ShopOperLog(operType = 1) @PostMapping("login") public R login(@RequestBody LoginBody loginBody){
