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

order-management/src/main/java/cn/freemud/management/service/handle/SaasOrderHandle.java

@@ -112,9 +112,10 @@ public class SaasOrderHandle {
     public BaseResponse orderDone(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
         BaseQueryOrderRequest orderDoneRequest = orderSdkAdapter.getOrderConfirmRequest(request.getOperator(), orderBean);
         //合阔pos 商户订单状态不自动扭转
-        if (CollectionUtils.isNotEmpty(notAutomaticTwistPartnerId) && notAutomaticTwistPartnerId.contains(orderBean.getCompanyId())) {
-            orderDoneRequest.setNotAutomaticTwist(true);
-        }
+        // 2021-07-07 合阔自动
+//        if (CollectionUtils.isNotEmpty(notAutomaticTwistPartnerId) && notAutomaticTwistPartnerId.contains(orderBean.getCompanyId())) {
+//            orderDoneRequest.setNotAutomaticTwist(true);
+//        }
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderDone(orderDoneRequest);
         if (baseOrderResponse == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {
             return ResponseUtil.error(ResponseResult.DONE_ORDER_FAIL);

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

@@ -572,7 +572,7 @@ public class CouponAdapter {
         // 重新校验一遍 couponcodes
         if (CollectionUtils.isNotEmpty(couponPromotionVO.getCouponCodes())) {
             Set<String> collect = couponPromotionVO.getCouponCodes().stream().filter(s -> !"".equals(s)).collect(Collectors.toSet());
-            if (CollectionUtils.isNotEmpty(collect)) {
+            if (CollectionUtils.isEmpty(collect)) {
                 couponPromotionVO.setCouponCodes(new HashSet<>());
             }
         }