Merge branch '2020/10/06-随单购买月享卡-huiyang' into 2020/10/29-fabu-huiyang

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

@@ -1249,6 +1249,7 @@ public class OrderAdapter {
                 ordersBean.getOrderCostDetailList().forEach(o -> {
                     if(o.getCostType() == 10 && o.getBillType() == 1) {
                         ProductVo productVo = new ProductVo();
+                        productVo.setQty(1);
                         productVo.setName(o.getCostName());
                         productVo.setSpuName(o.getCostName());
                         productVo.setFinalPrice(o.getCostAmount().longValue());

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

@@ -1488,8 +1488,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);
         }
     }