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

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

@@ -2399,7 +2399,7 @@ public class OrderAdapter {
         orderPayDto.setOpenId(paymentRequest.getOpenId());
         String businessDate = com.freemud.application.sdk.api.util.DateUtil.convert2String(new Date(), "yyyyMMdd");
         orderPayDto.setBusinessDate(businessDate);
-//        orderPayDto.setAmount(amount);
+        orderPayDto.setAmount(amount);
         orderPayDto.setUndisAmount(1L);
         orderPayDto.setVipAmount(Long.valueOf(cardAmount));
         orderPayDto.setAppId(paymentRequest.getWxAppId());