Merge remote-tracking branch 'origin/master'

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/issue/order/ListQrCodeResDTO.java

@@ -16,4 +16,7 @@ public class ListQrCodeResDTO {
 
     @ApiModelProperty(value = "二维码base64")
     private String qRbase64;
+
+    @ApiModelProperty(value = "订单金额，单位-分")
+    private Long amount;//订单金额（创建订单时的产品金额）
 }

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/issue/IssueOrderManageImpl.java

@@ -546,7 +546,7 @@ public class IssueOrderManageImpl extends AbstractIawManager implements IssueOrd
 
     @Override
     public ListQrCodeResDTO listQRcode(ListQrCodeReqDTO reqDto) throws ManagerException {
-        checkOrder(reqDto.getOrderNo());
+        IssueOrderinfo order = checkOrder(reqDto.getOrderNo());
         String context = "https://qtzl.etcjz.cn/default-bucket/order.html";
         int qrSize = 300;
         int qrMargin = 3;
@@ -578,6 +578,7 @@ public class IssueOrderManageImpl extends AbstractIawManager implements IssueOrd
         }
         ListQrCodeResDTO resDTO = new ListQrCodeResDTO();
         resDTO.setQRbase64(base64);
+        resDTO.setAmount(order.getAmount());
         return resDTO;
     }