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

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

@@ -2188,7 +2188,7 @@ public class OrderAdapter {
             return orderAccountVos;
         }
         List<Integer> list = Arrays.asList(OrderSettlementType.FULL_REDUCTION.getIndex(),OrderSettlementType.CASH_COUPON.getIndex(),
-                OrderSettlementType.PRODUCT_COUPON.getIndex(),OrderSettlementType.DISCOUNT_COUPON.getIndex(),OrderSettlementType.POINTS.getIndex());
+                OrderSettlementType.PRODUCT_COUPON.getIndex(),OrderSettlementType.DISCOUNT_COUPON.getIndex(),OrderSettlementType.POINTS.getIndex(),OrderSettlementType.FREIGHT_COUPON.getIndex());
         for (QueryOrdersResponse.DataBean.OrderBean.OrderSettlement orderSettlement : orderSettlements){
             if(list.contains(orderSettlement.getSettlementType())){
                 OrderAccountVo accountVo = new OrderAccountVo();
@@ -2201,6 +2201,8 @@ public class OrderAdapter {
                     accountVo.setTypeName("满减");
                 } else if(type == OrderSettlementType.POINTS.getIndex()){
                     accountVo.setTypeName("积分抵扣");
+                }else if(type == OrderSettlementType.FREIGHT_COUPON.getIndex()) {
+                    accountVo.setTypeName("配送券");
                 }
                 int value = orderSettlement.getSettlementAmount().intValue();
                 accountVo.setDiscountAmount(value < 0 ? -value : value);

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/OrderSettlementType.java

@@ -34,6 +34,7 @@ public enum OrderSettlementType {
     SPELL_GROUP(25,"拼团"),
     TAKEAWAY_ADD_PRICE(46, "外卖加价购"),
     SUPER_PURCHASE(47, "超值加购"),
+    FREIGHT_COUPON(99, "配送券"),
     PRODUCT_COUPON(118, "商品券"),
 
     POINTS(200, "积分"),

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

@@ -10,11 +10,13 @@ import com.freemud.application.sdk.api.storecenter.request.vo.GetOrgTreeListRequ
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
 import com.freemud.application.sdk.api.storecenter.response.vo.GetOrgTreeListResponse;
 import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
+import com.freemud.application.sdk.api.util.ResponseUtils;
 import com.google.common.base.Joiner;
 import org.apache.commons.collections4.CollectionUtils;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -43,12 +45,24 @@ public interface CommonService {
         request.setPartnerId(partnerId);
         request.setStoreCode(storeCode);
         StoreCenterService storeCenterService = SpringBeanUtil.getBean(StoreCenterService.class);
-        BaseResponse<List<String>> orgList = storeCenterService.getOrgList(request, LogThreadLocal.getTrackingNo());
-        if (orgList != null && ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(orgList.getCode())) {
-            return orgList.getData();
+        BaseResponse<GetOrgTreeListResponse> response  = storeCenterService.getOrgTreeList(request, LogThreadLocal.getTrackingNo());
+//        BaseResponse<List<String>> orgList = storeCenterService.getOrgList(request, LogThreadLocal.getTrackingNo());
+        if (Objects.equals("100", response.getCode()) && response.getData() != null) {
+            List<GetOrgTreeListResponse.OrgList> orgList = ((GetOrgTreeListResponse)response.getData()).getOrgList();
+            if (org.springframework.util.CollectionUtils.isEmpty(orgList)) {
+                return null;
+            } else {
+                List<String> orgIds = (List)orgList.stream().map(GetOrgTreeListResponse.OrgList::getOrganizationId).collect(Collectors.toList());
+                return orgIds;
             }
+        } else {
             return null;
         }
+//        if (orgList != null && ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(orgList.getCode())) {
+//            return orgList.getData();
+//        }
+//        return null;
+    }
 
     /**
      * 查询门店服务 - 获取组织code集合

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

@@ -179,6 +179,7 @@ public class CouponDiscountCalculation {
         for (int i = 0; i < cartGoodsList.size(); i++) {
             CartGoods cartGoods = cartGoodsList.get(i);
             cartGoods.setIsB3S1CouponGoods(0);
+            boolean useCoupon = false;
             if("9998".equals(cartGoods.getSkuId())) {
                 continue;
             }
@@ -199,12 +200,15 @@ public class CouponDiscountCalculation {
                             .filter(t -> ActivityTypeEnum.TYPE_32.getCode().equals(t.getType())
                                     || ActivityTypeEnum.TYPE_37.getCode().equals(t.getType())
                                     || ActivityTypeEnum.TYPE_39.getCode().equals(t.getType())).findFirst();
+                    useCoupon = targetDiscount.isPresent();
                     if (null != targetDiscount && targetDiscount.isPresent()) {
                         ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount goodsDiscount = targetDiscount.get();
                         cartGoods.setCouponName(goodsDiscount.getActivityName());
                         //普通商品券 和月享卡1.0的 商品最终售价更新为促销返回价格
                         cartGoods.setAmount(goodsMap.get(cartGoods.getCartGoodsUid()).getRealAmount());
                     }
+                }
+            }
 
             Optional<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount> b3S1DiscountOptional =  discountsNew.stream()
                     .filter(t -> ActivityTypeEnum.TYPE_35.getCode().equals(t.getType())).findFirst();
@@ -235,13 +239,11 @@ public class CouponDiscountCalculation {
                     cartGoods.setAmount(goodsMap.get(cartGoods.getCartGoodsUid()).getRealAmount());
                 }
             } else {
-                        if(!targetDiscount.isPresent()) {
+                if(!useCoupon) {
                     cartGoods.setCouponCode(null);
                     cartGoods.setCouponName(null);
                 }
             }
-                }
-            }
 
         }
         cartGoodsList.addAll(newCartGoodsList);
@@ -280,7 +282,7 @@ public class CouponDiscountCalculation {
             }
             for (int i = index+1; i < cartGoodsList.size(); i++) {
                 CartGoods cartGoods = cartGoodsList.get(i);
-                if(cartGoods.getIsB3S1Coupon() == 1) {
+                if(cartGoods.getIsB3S1CouponGoods() == 1) {
                     cartGoodsList.remove(i);
                     cartGoodsList.add(index, cartGoods);
                     index++;