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

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

@@ -1490,8 +1490,16 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
             req.setOrderCode(orderBean.getOid());
 
             orderSdkService.updateCostCouponCode(req,LogTreadLocal.getTrackingNo());
+
+            List<OrderBean.AccountBean> accountList = orderBean.getAccountList().stream().filter(
+                    account -> (withOrderBuyCouponCode.equals(account.getAccountId()))
+            ).collect(Collectors.toList());
+
+            if(CollectionUtils.isNotEmpty(accountList)) {
+                accountList.forEach(o -> o.setAccountId(buyCouponCode));
+            }
         } catch (Exception e){
-            LogUtil.error("getProducts_exception", null, null, e);
+            LogUtil.error("买券异常", null, null, e);
         }
     }