傅行帆 6 лет назад
Родитель
Сommit
b5061dfcd3

+ 9
- 6
CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/WxMPUserController.java Просмотреть файл

@@ -110,7 +110,9 @@ public class WxMPUserController {
110 110
 			}
111 111
 			//返回查询的金额
112 112
 			JSONObject jsonParam = carNoJson.getJSONObject("data").getJSONObject("JsonParam");
113
-			responseBean.addSuccess(jsonParam.get("ActualAmount"));
113
+			Map<String,Object> resultMap = Maps.newHashMap();
114
+			resultMap.put("ActualAmount",jsonParam.get("ActualAmount"));
115
+			responseBean.addSuccess(resultMap);
114 116
 		}
115 117
 		return responseBean;
116 118
 	}
@@ -128,11 +130,12 @@ public class WxMPUserController {
128 130
 		ResponseBean responseBean = new ResponseBean();
129 131
 		Map<String, String> resp = Maps.newHashMap();
130 132
 		try {
131
-			String parkInfoByCarNo = fuShiServer.getParkInfoByCarNo(carNo);
132
-			JSONObject carNoJson = JSONObject.parseObject(parkInfoByCarNo);
133
-			String actualAmount = String.valueOf(Double.valueOf(((BigDecimal) carNoJson.getJSONObject("JsonParam").get("ActualAmount")).toString()) * 100);
134
-			actualAmount = actualAmount.substring(0, actualAmount.lastIndexOf("."));
135
-			resp = wxMPUserService.wxTmpOrder(carNo,actualAmount,communityId,openid,(BigDecimal) carNoJson.getJSONObject("JsonParam").get("ActualAmount"));
133
+			//String parkInfoByCarNo = fuShiServer.getParkInfoByCarNo(carNo);
134
+			//JSONObject carNoJson = JSONObject.parseObject(parkInfoByCarNo);
135
+			//String actualAmount = String.valueOf(Double.valueOf(((BigDecimal) carNoJson.getJSONObject("JsonParam").get("ActualAmount")).toString()) * 100);
136
+			//actualAmount = actualAmount.substring(0, actualAmount.lastIndexOf("."));
137
+			//resp = wxMPUserService.wxTmpOrder(carNo,actualAmount,communityId,openid,(BigDecimal) carNoJson.getJSONObject("JsonParam").get("ActualAmount"));
138
+			resp = wxMPUserService.wxTmpOrder(carNo,"1",communityId,openid,new BigDecimal("0.1"));
136 139
 		} catch (Exception e) {
137 140
 			e.printStackTrace();
138 141
 			responseBean.addError(e.getMessage());

+ 5
- 4
文档/MYSQL/smartCommunity.pdb Просмотреть файл

@@ -1,5 +1,5 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1562638718" Name="smartCommunity" Objects="1344" Symbols="150" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
2
+<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1562828972" Name="smartCommunity" Objects="1333" Symbols="150" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
3 3
 <!-- do not edit this file -->
4 4
 
5 5
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -20137,11 +20137,12 @@ LABL 0 新宋体,8,N</a:FontList>
20137 20137
 <a:Code>price</a:Code>
20138 20138
 <a:CreationDate>1562638665</a:CreationDate>
20139 20139
 <a:Creator>szc</a:Creator>
20140
-<a:ModificationDate>1562638718</a:ModificationDate>
20140
+<a:ModificationDate>1562828972</a:ModificationDate>
20141 20141
 <a:Modifier>szc</a:Modifier>
20142 20142
 <a:Comment>缴费金额元</a:Comment>
20143
-<a:DataType>decimal(2)</a:DataType>
20144
-<a:Length>2</a:Length>
20143
+<a:DataType>decimal(10,2)</a:DataType>
20144
+<a:Length>10</a:Length>
20145
+<a:Precision>2</a:Precision>
20145 20146
 </o:Column>
20146 20147
 </c:Columns>
20147 20148
 <c:Keys>

+ 5
- 4
文档/MYSQL/smartCommunity.pdm Просмотреть файл

@@ -1,5 +1,5 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1562638718" Name="smartCommunity" Objects="1344" Symbols="150" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
2
+<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1562828972" Name="smartCommunity" Objects="1333" Symbols="150" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
3 3
 <!-- do not edit this file -->
4 4
 
5 5
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -20137,11 +20137,12 @@ LABL 0 新宋体,8,N</a:FontList>
20137 20137
 <a:Code>price</a:Code>
20138 20138
 <a:CreationDate>1562638665</a:CreationDate>
20139 20139
 <a:Creator>szc</a:Creator>
20140
-<a:ModificationDate>1562638718</a:ModificationDate>
20140
+<a:ModificationDate>1562828972</a:ModificationDate>
20141 20141
 <a:Modifier>szc</a:Modifier>
20142 20142
 <a:Comment>缴费金额元</a:Comment>
20143
-<a:DataType>decimal(2)</a:DataType>
20144
-<a:Length>2</a:Length>
20143
+<a:DataType>decimal(10,2)</a:DataType>
20144
+<a:Length>10</a:Length>
20145
+<a:Precision>2</a:Precision>
20145 20146
 </o:Column>
20146 20147
 </c:Columns>
20147 20148
 <c:Keys>