sdk 升级

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>2.1.55-RELEASE</version>
+    <version>2.1.56-RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>1.3.50.RELEASE</version>
+            <version>1.3.51.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

assortment-ordercenter-sdk/readme.md

@@ -130,3 +130,4 @@
 | 2.1.52-RELEASE |  sdk更新   | 张志恒 | 2021-04-26|
 | 2.1.54-RELEASE |   基础订单sdk qa/预发布、生产/环境使用LoadBalanced   | wuping | 2021-04-26|
 | 2.1.55-RELEASE |  统一升级华莱士微商城SDK   | 王航航 | 2021-05-10|
+| 2.1.56-RELEASE |  统一升级华莱士微商城SDK   | 张志恒 | 2021-05-11|

assortment-shoppingcart-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-shoppingcart-sdk</artifactId>
-    <version>1.2.8.RELEASE</version>
+    <version>1.2.9.RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

order-application-service/pom.xml

@@ -46,7 +46,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.1.55-RELEASE</version>
+            <version>2.1.56-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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

@@ -168,11 +168,6 @@ public enum ResponseResult {
     COLLAGE_ORDER_CREATE_ERROR_NOT_EXIST("45070", "拼单信息不存在，无法创建订单",""),
     COLLAGE_ORDER_CREATE_ERROR_PAYING("45071", "拼单正在支付，请勿重复提交",""),
     COLLAGE_ORDER_CREATE_ERROR_PAYED("45072", "拼单已支付完成，请返回订单列表查看",""),
-
-    ORDER_CANCEL_ERROR_EXPECT_TIME("45067", "预约时间还剩15分钟，无法取消"),
-    ORDER_CANCEL_ERROR_ESTIMATE_TIME("45068", "预计送达还剩30分钟，无法取消"),
-    STORE_SELF_ERROR("45069", "请选择截止营业时间大于45分钟下单"),
-    COUPON_INVALID("45070", "券已锁定，请先支付或取消待支付订单"),
     ORDER_CANCEL_ERROR_EXPECT_TIME("45067", "预约时间还剩15分钟，无法取消",""),
     ORDER_CANCEL_ERROR_ESTIMATE_TIME("45068", "预计送达还剩30分钟，无法取消",""),
     STORE_SELF_ERROR("45069", "请选择截止营业时间大于45分钟下单",""),
@@ -206,8 +201,6 @@ public enum ResponseResult {
     COUPON_VERIFICATION_FAIL("46012","优惠券核销失败",""),
     COUPON_CALLBACK_FAIL("46013","优惠券移除卡包失败",""),
     COUPON_INVAILD("46014", "优惠券失效",""),
-    COUPON_DATETIME_INVAILD("46015", "优惠券在当前时间不可用",""),
-    COUPON_ORDER_ORIGINAL_AMOUNT_NOT_ENOUGH("46016","优惠券不满足可用金额门槛",""),
     COUPON_TYPE_ERROR("46015","优惠类型错误",""),
     PAY_ERROR("46016","支付类型错误",""),
     COUPON_DATETIME_INVAILD("46017", "优惠券在当前时间不可用",""),
@@ -250,7 +243,6 @@ public enum ResponseResult {
      * coco券验证失败
      */
     COCO_COUPON_VALIDATOR_FAIL("70000", "优惠券验证错误",""),
-    ;
 
 
     /**

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

@@ -1042,7 +1042,7 @@ public class MallOrderServiceImpl implements MallOrderService {
             OrderChangeStateReq request = new OrderChangeStateReq();
             request.setOrderCode(baseQueryOrderRequest.getOrderId());
             request.setOrderState(NewOrderStatus.COMPLETE.getIndex());
-            request.setOperator(baseQueryOrderRequest.getOperator());
+            request.setOperator(assortmentCustomerInfoVo.getNickName());
             request.setRemark("已完成");
             orderSdkService.updateOrderState(request, baseQueryOrderRequest.getTrackingNo());
             orderSdkService.completeBookingTask(request, baseQueryOrderRequest.getTrackingNo());

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

@@ -4208,65 +4208,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)) {

order-management/pom.xml

@@ -65,7 +65,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.3.03-SNAPSHOT</version>
+            <version>2.1.56-RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

ordercenter-sdk/pom.xml

@@ -8,7 +8,7 @@
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.3.50.RELEASE</version>
+    <version>1.3.51.RELEASE</version>
     <artifactId>ordercenter-sdk</artifactId>
 
     <dependencies>

ordercenter-sdk/readme.md

@@ -81,4 +81,5 @@
 | 1.3.48.RELEASE |  支付方式新增英文字段   | 王航航 | 2021-04-20 |
 | 1.3.49.RELEASE |  基础订单sdk qa/预发布、生产/环境使用LoadBalanced   | 伍平 | 2021-03-22 |
 | 1.3.50.RELEASE |  华莱士商城SDK统一升级   | 王航航 | 2021-05-10 |
+| 1.3.51.RELEASE |  华莱士商城SDK统一升级   | 张志恒 | 2021-05-11 |
 

shopping-cart-application-service/pom.xml

@@ -45,7 +45,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-shoppingcart-sdk</artifactId>
-            <version>1.2.8.RELEASE</version>
+            <version>1.2.9.RELEASE</version>
         </dependency>
         <!--   再来一单查询订单信息  -->
         <dependency>

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

@@ -15,6 +15,7 @@ import cn.freemud.entities.vo.ActivityClassifyCouponBean;
 import cn.freemud.entities.vo.CartGoods;
 import cn.freemud.entities.vo.ShoppingCartInfoRequestVo;
 import cn.freemud.enums.*;
+import cn.freemud.interceptor.ServiceException;
 import cn.freemud.service.CouponService;
 import cn.freemud.utils.PropertyConvertUtil;
 import com.freemud.application.sdk.api.log.ApiLog;

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

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