移动代码

performance-api/src/main/java/com/clx/order/params/OrderGoodsChildParams.java → performance-api/src/main/java/com/clx/performance/param/pc/OrderGoodsChildParams.java

-package com.clx.order.params;
+package com.clx.performance.param.pc;
 
 import com.msl.common.convertor.type.MoneyInConvert;
 import io.swagger.annotations.ApiModelProperty;

performance-api/src/main/java/com/clx/order/params/OrderGoodsParams.java → performance-api/src/main/java/com/clx/performance/param/pc/OrderGoodsParams.java

-package com.clx.order.params;
+package com.clx.performance.param.pc;
 
 import com.msl.common.convertor.field.Converted;
 import io.swagger.annotations.ApiModelProperty;

performance-api/src/main/java/com/clx/order/params/PageCarrierOrderListParam.java → performance-api/src/main/java/com/clx/performance/param/pc/PageCarrierOrderListParam.java

-package com.clx.order.params;
+package com.clx.performance.param.pc;
 
 import com.msl.common.base.PageParam;
 import io.swagger.annotations.ApiModelProperty;

performance-api/src/main/java/com/clx/order/params/PageOrderGoodsListParam.java → performance-api/src/main/java/com/clx/performance/param/pc/PageOrderGoodsListParam.java

-package com.clx.order.params;
+package com.clx.performance.param.pc;
 
 import com.msl.common.base.PageParam;
 import io.swagger.annotations.ApiModelProperty;

performance-web/src/main/java/com/clx/performance/controller/pc/GoodsOrderController.java

@@ -2,8 +2,8 @@ package com.clx.performance.controller.pc;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.order.feign.OrderFeign;
-import com.clx.order.params.OrderGoodsParams;
-import com.clx.order.params.PageOrderGoodsListParam;
+import com.clx.performance.param.pc.OrderGoodsParams;
+import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.performance.component.GoodsOrderStrategyContext;
 import com.clx.performance.constant.RabbitKeyConstants;

performance-web/src/main/java/com/clx/performance/dao/OrderGoodsDao.java

 package com.clx.performance.dao;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.clx.order.params.PageOrderGoodsListParam;
+import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.mapper.OrderGoodsMapper;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.param.app.OrderGoodsListPageParam;
 import com.clx.performance.vo.app.OrderGoodsAPPVO;
-import com.clx.performance.vo.feign.OrderGoodsFeignVO;
 import com.clx.performance.vo.pc.OrderGoodsVO;
 import com.msl.common.base.Optional;
 import com.msl.common.dao.BaseDao;

performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java

@@ -2,15 +2,13 @@ package com.clx.performance.dao.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.clx.order.enums.OrderEnum;
-import com.clx.order.params.PageOrderGoodsListParam;
+import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.enums.OrderGoodsStatusEnum;
 import com.clx.performance.mapper.OrderGoodsMapper;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.param.app.OrderGoodsListPageParam;
 import com.clx.performance.vo.app.OrderGoodsAPPVO;
-import com.clx.performance.vo.feign.OrderGoodsFeignVO;
 import com.clx.performance.vo.pc.OrderGoodsVO;
 import com.msl.common.base.Optional;
 import com.msl.common.dao.impl.BaseDaoImpl;

performance-web/src/main/java/com/clx/performance/mapper/OrderGoodsMapper.java

@@ -3,10 +3,9 @@ package com.clx.performance.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.clx.order.params.PageOrderGoodsListParam;
+import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.sqlProvider.OrderGoodsSqlProvider;
-import com.clx.performance.sqlProvider.OrderGoodsTruckBindSqlProvider;
 import com.clx.performance.vo.app.OrderGoodsAPPVO;
 import com.clx.performance.vo.pc.OrderGoodsVO;
 import org.apache.ibatis.annotations.Param;

performance-web/src/main/java/com/clx/performance/service/OrderGoodsService.java

@@ -2,7 +2,7 @@ package com.clx.performance.service;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.clx.order.params.PageOrderGoodsListParam;
+import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.param.app.OrderGoodsListPageParam;
 import com.clx.performance.vo.app.OrderGoodsAPPVO;

performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.order.feign.OrderFeign;
-import com.clx.order.params.PageOrderGoodsListParam;
+import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dao.OrderGoodsDriverTruckDao;

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderGoodsSqlProvider.java

 package com.clx.performance.sqlProvider;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.clx.order.params.PageOrderGoodsListParam;
+import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.enums.OrderGoodsStatusEnum;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.vo.app.OrderGoodsAPPVO;

performance-web/src/main/java/com/clx/performance/strategy/GoodsOrderStrategy.java

 package com.clx.performance.strategy;
 
-import com.clx.order.params.OrderGoodsParams;
+import com.clx.performance.param.pc.OrderGoodsParams;
 import com.clx.order.vo.feign.FeignOrderVO;
 
 import java.time.LocalDateTime;

performance-web/src/main/java/com/clx/performance/strategy/impl/OneGoodsOrderStrategy.java

@@ -3,8 +3,8 @@ package com.clx.performance.strategy.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.param.feign.UpdateOrderInfoResidueWeightParam;
-import com.clx.order.params.OrderGoodsChildParams;
-import com.clx.order.params.OrderGoodsParams;
+import com.clx.performance.param.pc.OrderGoodsChildParams;
+import com.clx.performance.param.pc.OrderGoodsParams;
 import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.performance.component.GoodsOrderStrategyContext;
 import com.clx.performance.component.OrderGoodsIdGenerate;
@@ -13,7 +13,6 @@ import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dao.OrderGoodsTruckBindDao;
 import com.clx.performance.enums.*;
-import com.clx.performance.mapper.OrderGoodsMapper;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.service.OrderGoodsService;
 import com.clx.performance.strategy.GoodsOrderStrategy;

performance-web/src/main/java/com/clx/performance/strategy/impl/ThreeGoodsOrderStrategy.java

@@ -3,8 +3,8 @@ package com.clx.performance.strategy.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.param.feign.UpdateOrderInfoResidueWeightParam;
-import com.clx.order.params.OrderGoodsChildParams;
-import com.clx.order.params.OrderGoodsParams;
+import com.clx.performance.param.pc.OrderGoodsChildParams;
+import com.clx.performance.param.pc.OrderGoodsParams;
 import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.order.vo.feign.OrderOwnTruckVo;
 import com.clx.performance.component.GoodsOrderStrategyContext;

performance-web/src/main/java/com/clx/performance/strategy/impl/TwoGoodsOrderStrategy.java

@@ -3,8 +3,8 @@ package com.clx.performance.strategy.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.param.feign.UpdateOrderInfoResidueWeightParam;
-import com.clx.order.params.OrderGoodsChildParams;
-import com.clx.order.params.OrderGoodsParams;
+import com.clx.performance.param.pc.OrderGoodsChildParams;
+import com.clx.performance.param.pc.OrderGoodsParams;
 import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.performance.component.GoodsOrderStrategyContext;
 import com.clx.performance.component.OrderGoodsIdGenerate;
@@ -21,7 +21,6 @@ import com.msl.common.utils.DateUtils;
 import com.msl.user.data.UserSessionData;
 import com.msl.user.utils.TokenUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageBuilder;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;