Merge branch '20220930' into master_saas

mec-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsPortalOrderServiceImpl.java

@@ -419,12 +419,22 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
             order.setIntegrationAmount(bigDecimal);
             order.setPayAmount(order.getPayAmount().subtract(bigDecimal));
             orderMapper.updateByPrimaryKeySelective(order);
+
+            updateOrderDetail(order, userOrderPayment);
         }
         result.put("pay",data);
 
         return result;
     }
 
+    private void updateOrderDetail(OmsOrder order, UserOrderPayment userOrderPayment) {
+        OmsOrderDetail detail = detail(order.getOrderSn());
+        MallCreateOrderModel model = new MallCreateOrderModel();
+        model.setOrderNo(userOrderPayment.getAdapayNo());
+        model.setOrderInfo(JSON.toJSONString(detail));
+        webFeignService.mallSaveOrderInfo(model);
+    }
+
     private Map feignMecCouponAmount(String couponId,BigDecimal amount) {
 
         MallCreateOrderModel model = new MallCreateOrderModel();