配送费计算调整

order-application-service/src/main/java/cn/freemud/controller/OrderController.java

@@ -475,15 +475,4 @@ public class OrderController {
         orderCountJobHandler.execute(null);
         return ResponseUtil.success();
     }
-
-
-
-    /**
-     * 积分兑换记录查询（农工商）
-     */
-    @ApiAnnotation(logMessage = "scoreRecord")
-    @PostMapping("/scoreRecord")
-    public BaseResponse scoreRecord(@Validated @LogParams @RequestBody QueryOrderVo queryOrderVo) {
-        return orderservice.scoreRecord(queryOrderVo);
-    }
 }

order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java

@@ -178,8 +178,6 @@ public enum ResponseResult {
      * 售后单
      */
     ORDER_REFUND_EXPRESS_ERROR("45200", "售后单修改物流信息失败",""),
-    ORDER_RECEIVE_ERR("45071", "确认收货失败，请稍后再试",""),
-
 
     /**
      * 支付

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -4224,65 +4224,6 @@ public class OrderServiceImpl implements Orderservice {
     }
 
     @Override
-    public BaseResponse scoreRecord(QueryOrderVo queryOrderVo) {
-        AssortmentCustomerInfoVo userLoginInfoDto = customerInfoManager.getCustomerInfoByObject(queryOrderVo.getSessionId());
-        if (userLoginInfoDto == null || StringUtils.isBlank(userLoginInfoDto.getMemberId())) {
-            return ResponseUtil.error(ResponseResult.NOT_LOGIN);
-        }
-        Date startDate;
-        Date endDate;
-        if (StringUtils.isBlank(queryOrderVo.getStartDate()) || StringUtils.isBlank(queryOrderVo.getEndDate())) {
-            Date now = new Date();
-            startDate = DateUtil.addMonths(now, -6);
-            endDate = DateUtil.addDays(now, 1);
-        } else {
-            String startDateStr = queryOrderVo.getStartDate() + " 00:00:00";
-            String endDateStr = queryOrderVo.getEndDate() + " 23:59:59";
-            startDate = DateUtil.convert2Date(startDateStr, "yyyy-MM-dd HH:mm:ss");
-            if (startDate == null) {
-                return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR.getCode(), "查询订单开始时间格式不正确");
-            }
-            endDate = DateUtil.convert2Date(endDateStr, "yyyy-MM-dd HH:mm:ss");
-            if (endDate == null) {
-                return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR.getCode(), "查询订单结束时间格式不正确");
-            }
-        }
-
-        OrderConditionsReq queryOrdersDto = new OrderConditionsReq();
-        queryOrdersDto.setUserId(userLoginInfoDto.getMemberId());
-        queryOrdersDto.setPartnerId(userLoginInfoDto.getPartnerId());
-        queryOrdersDto.setPageSize(queryOrderVo.getPageSize() != null ? queryOrderVo.getPageSize() : 500);
-        queryOrdersDto.setPageNum(queryOrderVo.getPageNumber() != null ? queryOrderVo.getPageNumber() : 1);
-        queryOrdersDto.setStartTimestamp(startDate.getTime() / 1000);
-        queryOrdersDto.setEndTimestamp(endDate.getTime() / 1000);
-        queryOrdersDto.setOrderClients(Arrays.asList(OrderClientType.I_MEMBER.getIndex()));
-        queryOrdersDto.setBizType(4);
-        queryOrdersDto.setOrderStatus(OrderStatus.CALCEL.getCode());
-//        queryOrdersDto.setPayStatuses(Arrays.asList(PayStatus.HAVE_PAID.getCode()));
-        BaseDownLoadResponse<List<OrderInfoReqs>> response = orderDownLoadSdkService.queryOrderByConditions(queryOrdersDto, LogThreadLocal.getTrackingNo());
-
-        List<ScoreRecordVo> result = new ArrayList<>();
-        if (null == response || null == response.getResult()) {
-            return ResponseUtil.success(result);
-        }
-        List<OrderInfoReqs> list = response.getResult();
-        list.forEach(order -> {
-            ScoreRecordVo responseVo = new ScoreRecordVo();
-            responseVo.setOrderCode(order.getOrderCode());
-            if (order.getCreateTime() != null) {
-                responseVo.setCreateTime(Long.parseLong(order.getCreateTime()));
-            }
-            if (CollectionUtils.isNotEmpty(order.getOrderItemList())) {
-                responseVo.setProductName(order.getOrderItemList().get(0).getProductName());
-                responseVo.setProductQuantity(order.getOrderItemList().get(0).getProductQuantity());
-            }
-            result.add(responseVo);
-        });
-        return ResponseUtil.success(result);
-    }
-
-
-    @Override
     public BaseResponse spellGroupOrderFailRefund(SpellGroupFailRefundVo refundVo) {
         List<String> orderCodeList = refundVo.getOrderCodeList();
         if (CollectionUtils.isEmpty(orderCodeList) || orderCodeList.stream().anyMatch(StringUtils::isBlank)) {
@@ -4560,24 +4501,4 @@ public class OrderServiceImpl implements Orderservice {
         }
         return ResponseUtil.success(result.getResult());
     }
-
-
-
-
-    @Override
-    public BaseResponse<List<OrderCountResp>> selectCountOrdersByPartnerIds(OrderCountRequestVo orderCountRequestVo, String trackingNo) {
-        OrderCountReqs orderCountReqs = new OrderCountReqs();
-        BeanUtil.convertBean(orderCountRequestVo, orderCountReqs);
-
-        com.freemud.application.sdk.api.ordercenter.response.BaseResponse<List<OrderCountResp>> result = orderSdkService.countOrdersByPartnerIds(orderCountReqs, trackingNo);
-        if (Objects.isNull(result)) {
-            return new BaseResponse(ResponseResultEnum.SYSTEM_ERROR.getCode(), ResponseResultEnum.SYSTEM_ERROR.getMessage(), "", null);
-        }
-        if (!ResponseResultEnum.SUCCESS.getCode().equalsIgnoreCase(result.getCode()) || Objects.isNull(result.getResult())) {
-            return new BaseResponse(result.getCode(), result.getMessage(), "", null);
-        }
-        return ResponseUtil.success(result.getResult());
-    }
-
-
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java

@@ -970,11 +970,4 @@ public class OrderSdkService {
                 });
         return responseHandle(responseDTO);
     }
-
-    public BaseResponse<List<OrderCountResp>> countOrdersByPartnerIds(OrderCountReqs orderCountReqs,String trackingNo) {
-        OrderBaseResp responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, QUERY_ORDER_COUNT_REPORT,
-                createBaseRequest(orderCountReqs, trackingNo), new ParameterizedTypeReference<OrderBaseResp>() {
-                });
-        return responseHandle(responseDTO);
-    }
 }

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartMallServiceImpl.java

@@ -72,7 +72,6 @@ import java.util.stream.Collectors;
 import static java.util.stream.Collectors.toList;
 @Slf4j
 @Service
-@Slf4j
 public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
 
 

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java

@@ -672,7 +672,6 @@ public class ShoppingCartMCoffeeServiceImpl {
         List<CartGoods> cartGoodsList = assortmentSdkService.getShoppingCart(partnerId, storeId, userId, sessionId, "", shoppingCartBaseService);
         CartGoods monthCardProduct = null;
         ApiLog.debug("cartGoodsList: {}",JSONObject.toJSONString(cartGoodsList));
-        CartGoods monthCardProduct = null;
         // 如果购物车商品不为空， 则check购物车中所有商品
         if (CollectionUtils.isNotEmpty(cartGoodsList)) {
             // check购物车中所有商品

shopping-cart-application-service/src/test/java/cn.freemud/client/ShoppingCartClientTest.java

@@ -136,4 +136,4 @@
 //}
 
 
-}
+//}