Merge remote-tracking branch 'origin/develop' into develop

order-application-service/src/main/java/cn/freemud/adapter/DeliveryAdapter.java

@@ -12,6 +12,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.freemud.application.sdk.api.deliverycenter.dto.CreateDeliveryOrderRequestDto;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
+import com.freemud.sdk.api.assortment.order.enums.OldOrderAccountType;
 import com.freemud.sdk.api.assortment.order.request.order.CreateOrderProductRequest;
 import com.freemud.sdk.api.assortment.order.request.order.OrderProductAddInfoDto;
 import org.apache.commons.collections4.CollectionUtils;
@@ -142,7 +143,7 @@ public class DeliveryAdapter {
         deliveryOrderRequestDto.setDisplayOrderId(displayOrderId);
         deliveryOrderRequestDto.setTaxFlag(1);
         if (CollectionUtils.isNotEmpty(order.getAccountList())) {
-            List<QueryOrdersResponseDto.DataBean.OrderBean.AccountBean> collect = order.getAccountList().stream().filter(type -> type != null && !type.equals(1)).collect(Collectors.toList());
+            List<QueryOrdersResponseDto.DataBean.OrderBean.AccountBean> collect = order.getAccountList().stream().filter(account -> account != null && OldOrderAccountType.DELIVERY_AMOUNT.getCode().equals(account.getType())).collect(Collectors.toList());
             if (CollectionUtils.isNotEmpty(collect)) {
                 //配送费
                 deliveryOrderRequestDto.setDeliveryTotal(collect.get(0).getPrice().intValue());

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

@@ -320,8 +320,10 @@ public class ShoppingCartMCoffeeServiceImpl {
         // 获取用户信息
         CustomerInfoVo assortmentCustomerInfoVo = getCustomerInfoVo(shoppingCartInfoRequestVo.getSessionId());
         String userId = assortmentCustomerInfoVo.getMemberId();
-        String thirdPartyMemberID = assortmentCustomerInfoVo.getThirdPartyMemberID();
-        String unionId = assortmentCustomerInfoVo.getUnionId();
+//        String thirdPartyMemberID = assortmentCustomerInfoVo.getThirdPartyMemberID();
+//        String unionId = assortmentCustomerInfoVo.getUnionId();
+        String thirdPartyMemberID = "test";
+        String unionId = "test";
         String partnerId = shoppingCartInfoRequestVo.getPartnerId();
         String storeId = shoppingCartInfoRequestVo.getShopId();
         String appId = shoppingCartInfoRequestVo.getAppId();

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

@@ -198,9 +198,10 @@ public class CouponDiscountCalculation {
 //            if (Objects.equals(memberCoupon.getCouponType(), CouponTypeEnum.TYPE_1.getCode())
 //                    || Objects.equals(memberCoupon.getCouponType(), CouponTypeEnum.TYPE_3.getCode())) {
             // 只筛选小于结束时间得券
-            if (System.currentTimeMillis() < DateUtil.convert2Date(memberCoupon.getEndTime(), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS).getTime()) {
-                couponCodes.add(memberCoupon.getCouponCode());
-            }
+//            if (System.currentTimeMillis() < DateUtil.convert2Date(memberCoupon.getEndTime(), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS).getTime()) {
+//
+//            }
+            couponCodes.add(memberCoupon.getCouponCode());
 //            }
         });
 
@@ -376,8 +377,12 @@ public class CouponDiscountCalculation {
                 // 详情
                 GetMemberCouponListResponseVo.MemberCouponDetail detail = new GetMemberCouponListResponseVo.MemberCouponDetail();
                 detail.setActivityName(memberCoupon.getCouponName());
-                String startDate = DateUtil.convert2String(DateUtil.convert2Date(memberCoupon.getStartTime(), DateUtil.FORMAT_yyyyMMdd_date), DateUtil.FORMAT_yyyyMMdd_date).replace("-", ".");
-                String endDate = DateUtil.convert2String(DateUtil.convert2Date(memberCoupon.getEndTime(), DateUtil.FORMAT_yyyyMMdd_date), DateUtil.FORMAT_yyyyMMdd_date).replace("-", ".");
+                String startDate = "";
+                String endDate = "";
+                if(couponStateVo.getValidStartTime() != null && couponStateVo.getValidEndTime() != null){
+                    startDate = DateUtil.convert2String(DateUtil.convert2Date(couponStateVo.getValidStartTime(), DateUtil.FORMAT_yyyyMMdd_date), DateUtil.FORMAT_yyyyMMdd_date).replace("-", ".");
+                    endDate = DateUtil.convert2String(DateUtil.convert2Date(couponStateVo.getValidEndTime(), DateUtil.FORMAT_yyyyMMdd_date), DateUtil.FORMAT_yyyyMMdd_date).replace("-", ".");
+                }
                 detail.setEndTime(endDate);
                 detail.setStartTime(startDate);
                 String remark = couponStateVo.getActDesc();

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

@@ -121,15 +121,15 @@ public class TimeSaleCalculation {
             if ((goods = goodsMap.get(cartGoods.getSkuId())) == null || ObjectUtils.equals(ActivityTypeEnum.TYPE_81.getCode(), cartGoods.getActivityType())) {
                 continue;
             }
-            if(goods.getArtNo() == null){
-                throw new ServiceException(ResponseResult.OPERATE_TOO_OFTEN);
-            }
-            cartGoods.setCustomerCode(goods.getArtNo());
             ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount goodsDiscount = getGoodsDiscount(goods.getDiscounts(), Arrays.asList(ActivityTypeEnum.TYPE_2.getCode(), ActivityTypeEnum.TYPE_21.getCode(), ActivityTypeEnum.TYPE_23.getCode()));
             if (goodsDiscount == null) {
                 continue;
             }
-
+            //活动商品键位编号为空
+            if(CollectionUtils.isNotEmpty(goods.getDiscounts()) && StringUtils.isBlank(goods.getArtNo())){
+                throw new ServiceException(ResponseResult.OPERATE_TOO_OFTEN);
+            }
+            cartGoods.setCustomerCode(goods.getArtNo());
             Long totalDiscountAmount = goodsDiscount.getDiscount();
             ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
             activityDiscountsDto.setActivityCode(goodsDiscount.getActivityCode());

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

@@ -32,8 +32,13 @@ public class CouponState {
     private String limitType;
     private List<Product> productList;
 
+    //以下为麦咖啡新加字段
     private String actName;
 
     private String actDesc;
 
+    private String validEndTime;
+
+    private String validStartTime;
+
 }