update:订单列表时间查询修改

fengliang
1 parent d81cfbf1
Showing 10 changed files with 31 additions and 23 deletions
etrade-order/src/main/java/com/diligrp/etrade/order/api/OrderQueryBuyerController.java
etrade-order/src/main/java/com/diligrp/etrade/order/api/OrderQuerySellerController.java
etrade-order/src/main/java/com/diligrp/etrade/order/api/ShopCartApi.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/IShopCartMessageService.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/IShopCartService.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderServiceImpl.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/ShopCartImpl.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/ShopCartMessageServiceImpl.java
etrade-order/src/main/resources/com/diligrp/etrade/dao/mapper/order/OrderQueryBuyerMapper.xml
etrade-order/src/main/resources/com/diligrp/etrade/dao/mapper/order/OrderQuerySellerMapper.xml
@@ -124,15 +124,13 @@ public class OrderQueryBuyerController {
     @RequestMapping(value = "/queryOrderPageByBuyer",method = {RequestMethod.POST},produces="application/json;charset=UTF-8")
     public PageMessage<OrderDto> queryOrderPageByBuyer(@Valid @RequestBody OrderQueryBuyerDto orderQueryDto, BindingResult result){
         LOGGER.info("买家查询订单列表，{}",orderQueryDto);
-        if(orderQueryDto.getMonth()==null&&(orderQueryDto.getStartDate()==null||orderQueryDto.getEndDate()==null)){
-            throw new OrderException(OrderErrorCode.PARAM_ERROR,"请选择月份或自定义查询时间");
-        }else if(orderQueryDto.getStartDate()!=null&&orderQueryDto.getEndDate()!=null){
+        if(orderQueryDto.getStartDate()!=null&&orderQueryDto.getEndDate()!=null){
             if(orderQueryDto.getEndDate().isBefore(orderQueryDto.getStartDate())){
                 throw new OrderException(OrderErrorCode.PARAM_ERROR,"结束时间不能大于开始时间");
             }
             orderQueryDto.setStartDate(LocalDateTime.of(orderQueryDto.getStartDate().toLocalDate(), LocalTime.MIN));
             orderQueryDto.setEndDate(LocalDateTime.of(orderQueryDto.getEndDate().toLocalDate(), LocalTime.MAX));
-        }else{
+        }else if(orderQueryDto.getMonth()!=null){
             orderQueryDto.setStartDate(orderQueryDto.getMonth().with(TemporalAdjusters.firstDayOfMonth()).with(LocalTime.MIN));
             orderQueryDto.setEndDate(orderQueryDto.getMonth().with(TemporalAdjusters.lastDayOfMonth()).with(LocalTime.MAX));
         }
@@ -71,15 +71,13 @@ public class OrderQuerySellerController {
     @RequestMapping(value = "/queryOrderPageBySeller",method = {RequestMethod.POST},produces="application/json;charset=UTF-8")
     public PageMessage<OrderDto> queryOrderPageBySeller(@Valid @RequestBody OrderQuerySellerDto orderQuerySellerDto, BindingResult result){
         LOGGER.info("卖方查询订单列表，{}",orderQuerySellerDto);
-        if(orderQuerySellerDto.getMonth()==null&&(orderQuerySellerDto.getStartDate()==null||orderQuerySellerDto.getEndDate()==null)){
-            throw new OrderException(OrderErrorCode.PARAM_ERROR,"请选择月份或自定义查询时间");
-        }else if(orderQuerySellerDto.getStartDate()!=null&&orderQuerySellerDto.getEndDate()!=null){
+        if(orderQuerySellerDto.getStartDate()!=null&&orderQuerySellerDto.getEndDate()!=null){
             if(orderQuerySellerDto.getEndDate().isBefore(orderQuerySellerDto.getStartDate())){
                 throw new OrderException(OrderErrorCode.PARAM_ERROR,"结束时间不能大于开始时间");
             }
             orderQuerySellerDto.setStartDate(LocalDateTime.of(orderQuerySellerDto.getStartDate().toLocalDate(), LocalTime.MIN));
             orderQuerySellerDto.setEndDate(LocalDateTime.of(orderQuerySellerDto.getEndDate().toLocalDate(), LocalTime.MAX));
-        }else{
+        }else if(orderQuerySellerDto.getMonth()!=null){
             orderQuerySellerDto.setStartDate(orderQuerySellerDto.getMonth().with(TemporalAdjusters.firstDayOfMonth()).with(LocalTime.MIN));
             orderQuerySellerDto.setEndDate(orderQuerySellerDto.getMonth().with(TemporalAdjusters.lastDayOfMonth()).with(LocalTime.MAX));
         }
@@ -74,7 +74,7 @@ public class ShopCartApi {
                 throw new OrderException(OrderErrorCode.PARAM_ERROR,"重复提交");
             }
             bucket.set(1, Duration.ofSeconds(3));
-            shopCartService.saveShopCart(shopCartDto);
+            shopCartService.saveShopCart(shopCartDto,false);
             return Message.success();
         }finally {
             lock.unlock();
@@ -16,7 +16,7 @@ public interface IShopCartMessageService {
     void updateShopCartMessage(ShopCartMessageDto shopCartMessageDto);
-    void updateByOld(ShopCartMessage shopCartMessageOld,ShopCartMessageDto shopCartMessageDto,Boolean bo);
+    void updateByOld(ShopCartMessage shopCartMessageOld,ShopCartMessageDto shopCartMessageDto,Boolean bo,boolean checkflag);
     List<ShopCartMessage> findList(ShopCartMessageDto shopCartMessageDto);
@@ -10,7 +10,7 @@ public interface IShopCartService {
     List<ShopCartVo> listShopCart(ShopCartDto shopCartDto);
-    void saveShopCart(ShopCartDto shopCartDto);
+    void saveShopCart(ShopCartDto shopCartDto,boolean flag);
     void updateShopcartList(List<ShopCartCacheDto> shopCartCacheDtoList);
@@ -772,11 +772,12 @@ public class OrderServiceImpl implements OrderService {
         WeChatPayTradeDto weChatPayTradeDto = new WeChatPayTradeDto();
         //效验店铺
         ShopVo shop = orderGoodsService.checkShop(orderWeChatPayBatch.getShopId());
-        if(StringUtils.isBlank(shop.getWxMerchantNumber())){
-            throw new OrderException(OrderErrorCode.PARAM_ERROR,"卖方未开通微信支付，请选择其他支付方式");
-        }
+//        if(StringUtils.isBlank(shop.getWxMerchantNumber())){
+//            throw new OrderException(OrderErrorCode.PARAM_ERROR,"卖方未开通微信支付，请选择其他支付方式");
+//        }
         //构建微信支付参数
         weChatPayTradeDto.setAmount(orderWeChatPayBatch.getTotlePayAmount().multiply(NumberTransform.ONE_HUNDERD).longValue());
+        weChatPayTradeDto.setMarketId(orderWeChatPayBatch.getMarketId());
         weChatPayTradeDto.setType(orderWeChatPayBatch.getPayType());
         weChatPayTradeDto.setCode(orderWeChatPayBatch.getCode());
         weChatPayTradeDto.setOutTradeNo(orderWeChatPayBatch.getCodes().get(0));
@@ -159,7 +159,7 @@ public class ShopCartImpl implements IShopCartService {
      */
     @Transactional
     @Override
-    public void saveShopCart(ShopCartDto shopCartDto) {
+    public void saveShopCart(ShopCartDto shopCartDto ,boolean checkflag) {
         //1、判断是否存在该店铺信息，存在则更新店铺信息
         ShopCart shopCart = new ShopCart();
         shopCart.setShopId(shopCartDto.getShopId());
@@ -220,7 +220,7 @@ public class ShopCartImpl implements IShopCartService {
         }
         //存在相同商品信息，对商品信息进行更新操作
         ShopCartMessage shopCartMessageOld = shopCartMessages.get(0);
-        shopCartMessageService.updateByOld(shopCartMessageOld, shopCartDto.getShopCartMessageDto(),shopCartDto.getBo());
+        shopCartMessageService.updateByOld(shopCartMessageOld, shopCartDto.getShopCartMessageDto(),shopCartDto.getBo(),checkflag);
     }
@@ -237,7 +237,7 @@ public class ShopCartImpl implements IShopCartService {
                     shopCartDto.setShopCartMessageDto(shopCartMessageDto);
                     return shopCartDto;
                 }).toList();
-                shopCartDtos.forEach(this::saveShopCart);
+                shopCartDtos.forEach(item ->saveShopCart(item,true));
             }
         });
     }
@@ -130,14 +130,16 @@ public class ShopCartMessageServiceImpl implements IShopCartMessageService {
      */
     @Transactional
     @Override
-    public void updateByOld(ShopCartMessage shopCartMessageOld, ShopCartMessageDto shopCartMessageDto, Boolean bo) {
+    public void updateByOld(ShopCartMessage shopCartMessageOld, ShopCartMessageDto shopCartMessageDto, Boolean bo,boolean checkflag) {
         AssertUtils.notNull(shopCartMessageOld, "历史购物车商品信息不为空");
         AssertUtils.notNull(shopCartMessageDto, "新增购物车商品信息不为空");
         //获取历史购物车商品
         AssertUtils.isTrue(shopCartMessageOld.getType().equals(shopCartMessageDto.getType()), "历史购物车商品信息与新增购物车商品信息卖货方式不同");
         shopCartMessageDto.setId(shopCartMessageOld.getId());
         shopCartMessageDto.setVersion(shopCartMessageOld.getVersion());
-        shopCartMessageDto.setCheckFlag(shopCartMessageOld.getCheckFlag());
+        if(checkflag){
+            shopCartMessageDto.setCheckFlag(shopCartMessageDto.getCheckFlag());
+        }
         //如果是处理离线缓存数据，bo=true,总重量做覆盖，不是处理离线数据，总重量做增量
         if (bo) {
             //如果缓存时间在更新之前之前，说明缓存数据不是最新数据，则不进行更新操作
@@ -200,8 +200,13 @@
             <if test="achieveState != null">
                 and ord.achieve_state = #{achieveState,jdbcType=INTEGER}
             </if>
-            and ord.created_time >= #{startDate}
-            and #{endDate} >= ord.created_time
+            <if test="startDate != null">
+                and ord.created_time >= #{startDate}
+            </if>
+            <if test="endDate != null">
+                and #{endDate} >= ord.created_time
+            </if>
+
         </where>
         <if test="orderState != null and orderState == 1">
             order by ord.id desc
@@ -221,8 +221,12 @@
             <if test="customerId != null">
                 and ord.shop_customer_id = #{customerId}
             </if>
-            and ord.created_time >= #{startDate}
-            and #{endDate} >= ord.created_time
+            <if test="startDate != null">
+                and ord.created_time >= #{startDate}
+            </if>
+            <if test="endDate != null">
+                and #{endDate} >= ord.created_time
+            </if>
             <if test="storeEmployeeId != null">
                 and (opa.payee_seller_id = #{storeEmployeeId} or ord.seller_id = #{storeEmployeeId} or ord.verify_ids = #{storeEmployeeId} or ord.cancel_id = #{storeEmployeeId}
                 <if test="orderState == null or orderState == 1">