diff --git a/hiver-admin/test-output/test-report.html b/hiver-admin/test-output/test-report.html index acde873a..e48df27b 100644 --- a/hiver-admin/test-output/test-report.html +++ b/hiver-admin/test-output/test-report.html @@ -35,7 +35,7 @@ Hiver
  • -八月 28, 2024 10:01:13 +八月 31, 2024 18:53:32
    • @@ -84,7 +84,7 @@

    passTest

    -

    10:01:14 上午 / 0.016 secs

    +

    18:53:32 下午 / 0.02 secs

    @@ -92,9 +92,9 @@
    #test-id=1
    passTest
    -08.28.2024 10:01:14 -08.28.2024 10:01:14 -0.016 secs +08.31.2024 18:53:32 +08.31.2024 18:53:32 +0.02 secs
    @@ -104,7 +104,7 @@ Pass - 10:01:14 + 18:53:32 Test passed @@ -128,13 +128,13 @@

    Started

    -

    八月 28, 2024 10:01:13

    +

    八月 31, 2024 18:53:32

    Ended

    -

    八月 28, 2024 10:01:14

    +

    八月 31, 2024 18:53:32

    diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticscompanyroute/controller/LogisticsCompanyRouteController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticscompanyroute/controller/LogisticsCompanyRouteController.java new file mode 100644 index 00000000..21e364ae --- /dev/null +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticscompanyroute/controller/LogisticsCompanyRouteController.java @@ -0,0 +1,114 @@ +package cc.hiver.mall.logisticscompanyroute.controller; + +import cc.hiver.core.common.utils.ResultUtil; +import cc.hiver.core.common.vo.Result; +import cc.hiver.mall.logisticscompanyroute.entity.LogisticsCompanyRoute; +import cc.hiver.mall.logisticscompanyroute.service.LogisticsCompanyRouteService; +import cc.hiver.mall.logisticscompanyroute.vo.LogisticsCompanyRouteQueryVo; +import com.baomidou.mybatisplus.core.metadata.IPage; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 鐗╂祦鍏徃绾胯矾鎺у埗鍣 + * + * @author 鐜嬪瘜搴 + * @date 2024/8/24 + */ +@Slf4j +@RestController +@Api(tags = "鐗╂祦鍏徃绾胯矾鍏宠仈鎺ュ彛") +@RequestMapping("/hiver/app/logisticsCompanyRoute/") +@Transactional +public class LogisticsCompanyRouteController { + + @Autowired + private LogisticsCompanyRouteService logisticsCompanyRouteService; + + @PostMapping(value = "/addLogisticsCompanyRoute") + @ApiOperation("鏂板鐗╂祦鍏徃绾胯矾鍏宠仈") + public Result addLogisticsCompanyRoute(@RequestBody LogisticsCompanyRoute logisticsCompanyRoute) { + + final boolean b = logisticsCompanyRouteService.saveOrUpdate(logisticsCompanyRoute); + if (b) { + return ResultUtil.success("淇濆瓨鎴愬姛锛"); + } else { + return ResultUtil.error("淇濆瓨澶辫触锛"); + } + } + + /** + * 鏇存柊鐗╂祦鍏徃绾胯矾鍏宠仈 + * + * @param logisticsCompanyRoute + * @return Result + * @author 鐜嬪瘜搴 + * @date 2024/8/24 + */ + @PostMapping(value = "/updateLogisticsCompanyRoute") + @ApiOperation("鏇存柊鐗╂祦鍏徃绾胯矾鍏宠仈") + public Result updateLogisticsCompanyRoute(@RequestBody LogisticsCompanyRoute logisticsCompanyRoute) { + if (StringUtils.isEmpty(logisticsCompanyRoute.getId())) { + return ResultUtil.error("鍏徃绾胯矾鍏宠仈id涓嶈兘涓虹┖锛"); + } + final boolean b = logisticsCompanyRouteService.saveOrUpdate(logisticsCompanyRoute); + if (b) { + return ResultUtil.success("淇濆瓨鎴愬姛锛"); + } else { + return ResultUtil.error("淇濆瓨澶辫触锛"); + } + } + + /** + * 鍒犻櫎鐗╂祦鍏徃绾胯矾鍏宠仈 + * + * @param id + * @return Result + * @author 鐜嬪瘜搴 + * @date 2024/8/24 + */ + @PostMapping(value = "/deleteLogisticsCompanyRoute") + @ApiOperation("鍒犻櫎鐗╂祦鍏徃绾胯矾鍏宠仈") + public Result deleteLogisticsCompanyRoute(String id) { + if (StringUtils.isEmpty(id)) { + return ResultUtil.error("鍏徃绾胯矾鍏宠仈id涓嶈兘涓虹┖锛"); + } + final boolean b = logisticsCompanyRouteService.removeById(id); + if (b) { + return ResultUtil.success("鍒犻櫎鎴愬姛锛"); + } else { + return ResultUtil.error("鍒犻櫎澶辫触锛"); + } + } + + /** + * 鍒嗛〉鏌ヨ鐗╂祦鍏徃绾胯矾鍏宠仈 + * + * @param logisticsCompanyRouteQueryVo + * @return Result> + * @author 鐜嬪瘜搴 + * @date 2024/8/24 + */ + @RequestMapping(value = "/getLogisticsCompanyRoutePageList", method = RequestMethod.POST) + @ApiOperation(value = "鍒嗛〉鏌ヨ鐗╂祦鍏徃绾胯矾鍏宠仈") + public Result> getLogisticsCompanyRoutePageList(@RequestBody(required = false) LogisticsCompanyRouteQueryVo logisticsCompanyRouteQueryVo) { + final IPage result = logisticsCompanyRouteService.getLogisticsCompanyRoutePageList(logisticsCompanyRouteQueryVo); + return new ResultUtil>().setData(result); + } + + // 鏍规嵁鍏徃id鏌ヨ鎵鏈夊叧鑱旂殑绾胯矾淇℃伅锛堜笉鍒嗛〉锛 + @RequestMapping(value = "/getLogisticsCompanyRouteListByCompanyId", method = RequestMethod.POST) + @ApiOperation(value = "鏍规嵁鍏徃id鏌ヨ鎵鏈夊叧鑱旂殑绾胯矾淇℃伅锛堜笉鍒嗛〉锛") + public Result> getLogisticsCompanyRouteListByCompanyId(@RequestBody(required = false) LogisticsCompanyRouteQueryVo logisticsCompanyRouteQueryVo) { + final List result = logisticsCompanyRouteService.getLogisticsCompanyRouteListByCompanyId(logisticsCompanyRouteQueryVo); + return new ResultUtil>().setData(result); + } + +} diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticscompanyroute/entity/LogisticsCompanyRoute.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticscompanyroute/entity/LogisticsCompanyRoute.java new file mode 100644 index 00000000..eeaa3f4b --- /dev/null +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticscompanyroute/entity/LogisticsCompanyRoute.java @@ -0,0 +1,36 @@ +package cc.hiver.mall.logisticscompanyroute.entity; + +import cc.hiver.core.base.HiverBaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 鐗╂祦绾胯矾瀹炰綋 + * + * @author 鐜嬪瘜搴 + * @date 2024/8/24 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@ApiModel(value = "鐗╂祦绾胯矾鍏宠仈琛") +@TableName(value = "t_logistics_company_route", autoResultMap = true) +public class LogisticsCompanyRoute extends HiverBaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "鐗╂祦鍏徃id") + private String companyId; + + @ApiModelProperty(value = "鐗╂祦鍏徃鍚嶇О") + private String companyName; + + @ApiModelProperty(value = "绾胯矾id") + private String circuitId; + + @ApiModelProperty(value = "绾胯矾鍚嶇О") + private String circuitName; + +} diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticscompanyroute/mapper/LogisticsCompanyRouteMapper.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticscompanyroute/mapper/LogisticsCompanyRouteMapper.java new file mode 100644 index 00000000..a56bbb04 --- /dev/null +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticscompanyroute/mapper/LogisticsCompanyRouteMapper.java @@ -0,0 +1,26 @@ +package cc.hiver.mall.logisticscompanyroute.mapper; + +import cc.hiver.mall.logisticscompanyroute.entity.LogisticsCompanyRoute; +import cc.hiver.mall.logisticscompanyroute.vo.LogisticsCompanyRouteQueryVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface LogisticsCompanyRouteMapper extends BaseMapper { + + /** + * 鍒嗛〉鏌ヨ鐗╂祦绾胯矾 + * + * @param page + * @param logisticsCompanyRouteQueryVo + * @return IPage + * @author 鐜嬪瘜搴 + * @date 2024/8/24 + */ + IPage getLogisticsCompanyRoutePageList(Page page, @Param("queryParams") LogisticsCompanyRouteQueryVo logisticsCompanyRouteQueryVo); + + List getLogisticsCompanyRouteListByCompanyId(@Param("queryParams")LogisticsCompanyRouteQueryVo logisticsCompanyRouteQueryVo); +} diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticscompanyroute/service/LogisticsCompanyRouteService.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticscompanyroute/service/LogisticsCompanyRouteService.java new file mode 100644 index 00000000..26756fc9 --- /dev/null +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticscompanyroute/service/LogisticsCompanyRouteService.java @@ -0,0 +1,23 @@ +package cc.hiver.mall.logisticscompanyroute.service; + +import cc.hiver.mall.logisticscompanyroute.entity.LogisticsCompanyRoute; +import cc.hiver.mall.logisticscompanyroute.vo.LogisticsCompanyRouteQueryVo; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +public interface LogisticsCompanyRouteService extends IService { + + /** + * 鍒嗛〉鏌ヨ鐗╂祦绾胯矾 + * + * @param logisticsCompanyRouteQueryVo + * @return IPage + * @author 鐜嬪瘜搴 + * @date 2024/8/24 + */ + IPage getLogisticsCompanyRoutePageList(LogisticsCompanyRouteQueryVo logisticsCompanyRouteQueryVo); + + List getLogisticsCompanyRouteListByCompanyId(LogisticsCompanyRouteQueryVo logisticsCompanyRouteQueryVo); +} diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticscompanyroute/service/impl/LogisticsCompanyRouteServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticscompanyroute/service/impl/LogisticsCompanyRouteServiceImpl.java new file mode 100644 index 00000000..87fcba19 --- /dev/null +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticscompanyroute/service/impl/LogisticsCompanyRouteServiceImpl.java @@ -0,0 +1,38 @@ +package cc.hiver.mall.logisticscompanyroute.service.impl; + +import cc.hiver.mall.logisticscompanyroute.entity.LogisticsCompanyRoute; +import cc.hiver.mall.logisticscompanyroute.mapper.LogisticsCompanyRouteMapper; +import cc.hiver.mall.logisticscompanyroute.service.LogisticsCompanyRouteService; +import cc.hiver.mall.logisticscompanyroute.vo.LogisticsCompanyRouteQueryVo; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class LogisticsCompanyRouteServiceImpl extends ServiceImpl implements LogisticsCompanyRouteService { + + @Autowired + private LogisticsCompanyRouteMapper logisticsCompanyRouteMapper; + + /** + * 鍒嗛〉鏌ヨ鐗╂祦绾胯矾 + * @author 鐜嬪瘜搴 + * @date 2024/8/24 + * @param logisticsCompanyRouteQueryVo + * @return IPage + */ + @Override + public IPage getLogisticsCompanyRoutePageList(LogisticsCompanyRouteQueryVo logisticsCompanyRouteQueryVo) { + final Page page = new Page<>(logisticsCompanyRouteQueryVo.getPageNum(), logisticsCompanyRouteQueryVo.getPageSize()); + return logisticsCompanyRouteMapper.getLogisticsCompanyRoutePageList(page, logisticsCompanyRouteQueryVo); + } + + @Override + public List getLogisticsCompanyRouteListByCompanyId(LogisticsCompanyRouteQueryVo logisticsCompanyRouteQueryVo) { + return logisticsCompanyRouteMapper.getLogisticsCompanyRouteListByCompanyId(logisticsCompanyRouteQueryVo); + } +} diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticscompanyroute/vo/LogisticsCompanyRouteQueryVo.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticscompanyroute/vo/LogisticsCompanyRouteQueryVo.java new file mode 100644 index 00000000..287e2da2 --- /dev/null +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticscompanyroute/vo/LogisticsCompanyRouteQueryVo.java @@ -0,0 +1,29 @@ +package cc.hiver.mall.logisticscompanyroute.vo; + +import cc.hiver.core.base.HiverBasePageQuery; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 鐗╂祦绾胯矾鍏宠仈鏌ヨ鏉′欢 + * + * @author 鐜嬪瘜搴 + * @date 2024/8/24 + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class LogisticsCompanyRouteQueryVo extends HiverBasePageQuery { + + @ApiModelProperty(value = "鐗╂祦鍏徃id") + private String companyId; + + @ApiModelProperty(value = "鐗╂祦鍏徃鍚嶇О") + private String companyName; + + @ApiModelProperty(value = "绾胯矾id") + private String circuitId; + + @ApiModelProperty(value = "绾胯矾鍚嶇О") + private String circuitName; +} diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsorder/entity/LogisticsOrder.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsorder/entity/LogisticsOrder.java index 83dd8dbe..b80ad045 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsorder/entity/LogisticsOrder.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsorder/entity/LogisticsOrder.java @@ -107,5 +107,8 @@ public class LogisticsOrder extends HiverBaseEntity { @ApiModelProperty(value = "鏀惰揣绔欎汉濮撳悕") private String receivingUserName; + @ApiModelProperty(value = "鍥剧墖璺緞") + private String imagePath; + } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsorder/service/impl/LogisticsOrderServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsorder/service/impl/LogisticsOrderServiceImpl.java index 557472a8..11e247a4 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsorder/service/impl/LogisticsOrderServiceImpl.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsorder/service/impl/LogisticsOrderServiceImpl.java @@ -4,9 +4,11 @@ import cc.hiver.mall.logisticsorder.entity.LogisticsOrder; import cc.hiver.mall.logisticsorder.mapper.LogisticsOrderMapper; import cc.hiver.mall.logisticsorder.service.LogisticsOrderService; import cc.hiver.mall.logisticsorder.vo.LogisticsOrderQueryVo; +import cc.hiver.mall.utils.DateUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -26,6 +28,10 @@ public class LogisticsOrderServiceImpl extends ServiceImpl getLogisticsOrderPageList(LogisticsOrderQueryVo logisticsOrderQueryVo) { + // 濡傛灉鎸夌収鏃堕棿鑼冨洿鏌ヨ锛岀粨鏉熸椂闂村姞1澶 + if(StringUtils.isNotEmpty(logisticsOrderQueryVo.getEndDate())){ + logisticsOrderQueryVo.setEndDate(DateUtil.addDay(logisticsOrderQueryVo.getEndDate(), 1)); + } final Page page = new Page<>(logisticsOrderQueryVo.getPageNum(), logisticsOrderQueryVo.getPageSize()); return logisticsOrderMapper.getLogisticsOrderPageList(page, logisticsOrderQueryVo); } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsorder/vo/LogisticsOrderQueryVo.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsorder/vo/LogisticsOrderQueryVo.java index f090fba7..720ff492 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsorder/vo/LogisticsOrderQueryVo.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsorder/vo/LogisticsOrderQueryVo.java @@ -15,11 +15,17 @@ import lombok.EqualsAndHashCode; @Data public class LogisticsOrderQueryVo extends HiverBasePageQuery { - @ApiModelProperty(value = "鐗╂祦鍏徃鍚嶇О") - private String companyName; + @ApiModelProperty(value = "鐗╂祦鍏徃id") + private String companyId; - @ApiModelProperty(value = "绾胯矾鍚嶇О") - private String circuitName; + @ApiModelProperty(value = "绾胯矾id") + private String circuitId; + + @ApiModelProperty(value = "鍑哄彂绔檌d") + private String goStationId; + + @ApiModelProperty(value = "鍒拌揪绔檌d") + private String arrivalStationId; @ApiModelProperty(value = "鍙戣揣浜哄悕绉") private String shipperName; @@ -27,11 +33,38 @@ public class LogisticsOrderQueryVo extends HiverBasePageQuery { @ApiModelProperty(value = "鍙戣揣浜鸿仈绯绘柟寮") private String shipperMobile; + @ApiModelProperty(value = "鏀惰揣浜哄悕绉") + private String receiverName; + + @ApiModelProperty(value = "鏀惰揣浜鸿仈绯绘柟寮") + private String receiverMobile; + + @ApiModelProperty(value = "鐗╂祦鍏徃鍚嶇О") + private String companyName; + + @ApiModelProperty(value = "绾胯矾鍚嶇О") + private String circuitName; + @ApiModelProperty(value = "鍙戣揣鍦板潃") private String shipperAddress; - @ApiModelProperty(value = "鏀惰揣浜哄悕绉") - private String receiverName; + @ApiModelProperty(value = "鏀惰揣鍦板潃") + private String receiverAddress; + + @ApiModelProperty(value = "鍑哄彂绔欏悕绉") + private String goStationName; + + @ApiModelProperty(value = "鍒拌揪绔欏悕绉") + private String arrivalStationName; + + @ApiModelProperty(value = "绁ㄥ彿") + private String orderNumber; + + @ApiModelProperty(value = "鐗╀綋鍚嶇О") + private String objectName; + + @ApiModelProperty(value = "澶囨敞") + private String remark; @ApiModelProperty(value = "寮濮嬫椂闂") private String startDate; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/controller/LogisticsStationController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/controller/LogisticsStationController.java index 617d1d96..f0a81b98 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/controller/LogisticsStationController.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/controller/LogisticsStationController.java @@ -9,10 +9,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * 鐗╂祦绔欑偣鎺у埗鍣 * @@ -103,4 +106,22 @@ public class LogisticsStationController { final IPage result = logisticsStationService.getLogisticsStationPageList(logisticsRouteQueryVo); return new ResultUtil>().setData(result); } + + /** + * 鏍规嵁鐗╂祦鍏徃id鏌ヨ鎵鏈夌珯鐐逛俊鎭 + * + * @param logisticsRouteQueryVo + * @return Result> + * @author 鐜嬪瘜搴 + * @date 2024/8/28 + */ + @RequestMapping(value = "/getLogisticsStationListByCompanyId", method = RequestMethod.POST) + @ApiOperation(value = "鏍规嵁鐗╂祦鍏徃id鏌ヨ鎵鏈夌珯鐐逛俊鎭") + public Result> getLogisticsStationListByCompanyId(@RequestBody(required = false) LogisticsStationQueryVo logisticsRouteQueryVo) { + if (StringUtils.isEmpty(logisticsRouteQueryVo.getCompanyId())) { + return ResultUtil.error("鐗╂祦鍏徃淇℃伅涓嶈兘涓虹┖锛"); + } + final List result = logisticsStationService.getLogisticsStationListByCompanyId(logisticsRouteQueryVo); + return new ResultUtil>().setData(result); + } } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/mapper/LogisticsStationMapper.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/mapper/LogisticsStationMapper.java index 33480602..c977b41e 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/mapper/LogisticsStationMapper.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/mapper/LogisticsStationMapper.java @@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface LogisticsStationMapper extends BaseMapper { /** @@ -19,4 +21,14 @@ public interface LogisticsStationMapper extends BaseMapper { * @date 2024/8/24 */ IPage getLogisticsStationPageList(Page page, @Param("queryParams") LogisticsStationQueryVo logisticsRouteQueryVo); + + /** + * 鏍规嵁鐗╂祦鍏徃id鏌ヨ鎵鏈夌珯鐐逛俊鎭 + * + * @param logisticsRouteQueryVo + * @return List + * @author 鐜嬪瘜搴 + * @date 2024/8/28 + */ + List getLogisticsStationListByCompanyId(@Param("queryParams") LogisticsStationQueryVo logisticsRouteQueryVo); } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/service/LogisticsStationService.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/service/LogisticsStationService.java index 5dc6b253..df0d380e 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/service/LogisticsStationService.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/service/LogisticsStationService.java @@ -5,6 +5,8 @@ import cc.hiver.mall.logisticsstation.vo.LogisticsStationQueryVo; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + public interface LogisticsStationService extends IService { /** @@ -16,4 +18,14 @@ public interface LogisticsStationService extends IService { * @date 2024/8/24 */ IPage getLogisticsStationPageList(LogisticsStationQueryVo logisticsRouteQueryVo); + + /** + * 鏍规嵁鐗╂祦鍏徃id鏌ヨ鎵鏈夌珯鐐逛俊鎭 + * + * @param logisticsRouteQueryVo + * @return List + * @author 鐜嬪瘜搴 + * @date 2024/8/28 + */ + List getLogisticsStationListByCompanyId(LogisticsStationQueryVo logisticsRouteQueryVo); } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/service/impl/LogisticsStationServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/service/impl/LogisticsStationServiceImpl.java index 0689f1cc..4aacb33f 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/service/impl/LogisticsStationServiceImpl.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/service/impl/LogisticsStationServiceImpl.java @@ -10,6 +10,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class LogisticsStationServiceImpl extends ServiceImpl implements LogisticsStationService { @@ -29,4 +31,17 @@ public class LogisticsStationServiceImpl extends ServiceImpl page = new Page<>(logisticsRouteQueryVo.getPageNum(), logisticsRouteQueryVo.getPageSize()); return logisticsStationMapper.getLogisticsStationPageList(page, logisticsRouteQueryVo); } + + /** + * 鏍规嵁鐗╂祦鍏徃id鏌ヨ鎵鏈夌珯鐐逛俊鎭 + * + * @param logisticsRouteQueryVo + * @return List + * @author 鐜嬪瘜搴 + * @date 2024/8/28 + */ + @Override + public List getLogisticsStationListByCompanyId(LogisticsStationQueryVo logisticsRouteQueryVo) { + return logisticsStationMapper.getLogisticsStationListByCompanyId(logisticsRouteQueryVo); + } } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/vo/LogisticsStationQueryVo.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/vo/LogisticsStationQueryVo.java index 849c0e3c..413f15a0 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/vo/LogisticsStationQueryVo.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/vo/LogisticsStationQueryVo.java @@ -12,6 +12,9 @@ import lombok.Data; @Data public class LogisticsStationQueryVo extends HiverBasePageQuery { + @ApiModelProperty(value = "鐗╂祦鍏徃id") + private String companyId; + @ApiModelProperty(value = "绾胯矾id") private String circuitId; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsuser/entity/LogisticsUser.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsuser/entity/LogisticsUser.java index 1ec48626..b9d4b67b 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsuser/entity/LogisticsUser.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsuser/entity/LogisticsUser.java @@ -31,6 +31,6 @@ public class LogisticsUser extends HiverBaseEntity { private String companyId; @ApiModelProperty(value = "瑙掕壊:0:绠＄悊鍛樸1:鎿嶄綔鍛樸2:鏀惰揣鍛") - private String role; + private String userRole; } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/AliOcrUtil.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/AliOcrUtil.java index 109b3ebb..016b9d5a 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/AliOcrUtil.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/AliOcrUtil.java @@ -851,7 +851,7 @@ public class AliOcrUtil { msgManager.add(userMsg); stopWatch.start("寮濮嬪洖绛"); final QwenParam param = - QwenParam.builder().model("qwen2-72b-instruct").messages(msgManager.get()) + QwenParam.builder().model("qwen-max").messages(msgManager.get()) .resultFormat(QwenParam.ResultFormat.MESSAGE) .seed(1234) .temperature(0.85F) @@ -903,7 +903,7 @@ public class AliOcrUtil { msgManager.add(systemMsg); msgManager.add(userMsg); final QwenParam param = - QwenParam.builder().model("qwen2-72b-instruct").messages(msgManager.get()) + QwenParam.builder().model("qwen-max").messages(msgManager.get()) .resultFormat(QwenParam.ResultFormat.MESSAGE) .seed(1234) .temperature(0.85F) @@ -945,7 +945,7 @@ public class AliOcrUtil { msgManager.add(userMsg); stopWatch.start("寮濮嬪洖绛"); final QwenParam param = - QwenParam.builder().model("qwen2-72b-instruct").messages(msgManager.get()) + QwenParam.builder().model("qwen-max").messages(msgManager.get()) .resultFormat(QwenParam.ResultFormat.MESSAGE) .seed(1234) .temperature(0.85F) diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/LogisticsCompanyRouteMapper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/LogisticsCompanyRouteMapper.xml new file mode 100644 index 00000000..598621dc --- /dev/null +++ b/hiver-modules/hiver-mall/src/main/resources/mapper/LogisticsCompanyRouteMapper.xml @@ -0,0 +1,187 @@ + + + + + + + + + + + + + + + + + + id, create_by, create_time, del_flag, update_by, update_time,company_id, company_name, circuit_id, circuit_name + + + + + + delete from t_logistics_company_route + where id = #{id,jdbcType=VARCHAR} + + + + insert into t_logistics_company_route + (id, create_by, create_time, del_flag, update_by, update_time,company_id, company_name, circuit_id, circuit_name) + values (#{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, + #{delFlag,jdbcType=INTEGER}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, + #{companyId,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, #{circuitId,jdbcType=VARCHAR}, #{circuitName,jdbcType=VARCHAR}) + + + + update t_logistics_company_route + + + id = #{record.id,jdbcType=VARCHAR}, + + + create_by = #{record.createBy,jdbcType=VARCHAR}, + + + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + + + del_flag = #{record.delFlag,jdbcType=INTEGER}, + + + update_by = #{record.updateBy,jdbcType=VARCHAR}, + + + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + + + company_id = #{record.companyId,jdbcType=VARCHAR}, + + + company_name = #{record.companyName,jdbcType=VARCHAR}, + + + circuit_id = #{record.circuitId,jdbcType=VARCHAR}, + + + circuit_name = #{record.circuitName,jdbcType=VARCHAR}, + + + + + + update t_logistics_company_route + set id = #{record.id,jdbcType=VARCHAR}, + create_by = #{record.createBy,jdbcType=VARCHAR}, + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + del_flag = #{record.delFlag,jdbcType=INTEGER}, + update_by = #{record.updateBy,jdbcType=VARCHAR}, + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + company_id = #{record.companyId,jdbcType=VARCHAR}, + company_name = #{record.companyName,jdbcType=VARCHAR}, + circuit_id = #{record.circuitId,jdbcType=VARCHAR}, + circuit_name = #{record.circuitName,jdbcType=VARCHAR} + + + + update t_logistics_company_route + + + create_by = #{createBy,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + del_flag = #{delFlag,jdbcType=INTEGER}, + + + update_by = #{updateBy,jdbcType=VARCHAR}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + company_id = #{companyId,jdbcType=VARCHAR}, + + + company_name = #{companyName,jdbcType=VARCHAR}, + + + circuit_id = #{circuitId,jdbcType=VARCHAR}, + + + circuit_name = #{circuitName,jdbcType=VARCHAR}, + + + where id = #{id,jdbcType=VARCHAR} + + + + update t_logistics_company_route + set create_by = #{createBy,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + del_flag = #{delFlag,jdbcType=INTEGER}, + update_by = #{updateBy,jdbcType=VARCHAR}, + update_time = #{updateTime,jdbcType=TIMESTAMP}, + company_id = #{companyId,jdbcType=VARCHAR}, + company_name = #{companyName,jdbcType=VARCHAR}, + circuit_id = #{circuitId,jdbcType=VARCHAR}, + circuit_name = #{circuitName,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} + + + + + + + \ No newline at end of file diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/LogisticsOrderMapper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/LogisticsOrderMapper.xml index d145be13..984ca1d9 100644 --- a/hiver-modules/hiver-mall/src/main/resources/mapper/LogisticsOrderMapper.xml +++ b/hiver-modules/hiver-mall/src/main/resources/mapper/LogisticsOrderMapper.xml @@ -36,13 +36,14 @@ + id, create_by, create_time, del_flag, update_by, update_time,company_id, company_name, circuit_id, circuit_name, shipper_name, shipper_mobile, shipper_address, receiver_name, receiver_mobile, receiver_address, go_station_id, go_station_name, arrival_station_id, arrival_station_name, weight, count, freight, premium, - transit_fee, tips, method_of_settlement, cost, all_cost, order_number, object_name, remark, receiving_user_id, receiving_user_name + transit_fee, tips, method_of_settlement, cost, all_cost, order_number, object_name, remark, receiving_user_id, receiving_user_name,image_path + + \ No newline at end of file