魏熙美 6 years ago
parent
commit
cc9d32f7b9

+ 2
- 2
CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/WxPayController.java View File

@@ -191,10 +191,10 @@ public class WxPayController {
191 191
 	@ApiOperation(value = "取消支付", notes = "取消支付")
192 192
 	@ApiImplicitParams({
193 193
 			@ApiImplicitParam(paramType = "path", dataType = "String", name = "outTradeNo", value = "订单号"),
194
-			@ApiImplicitParam(paramType = "form", dataType = "String", name = "outTradeNo", value = "type: 类型(car 车缴费, bill 物业缴费)"),
194
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "type", value = "type: 类型(car 车缴费, bill 物业缴费)"),
195 195
 			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
196 196
 	})
197
-	@RequestMapping(value = "/wxCancelPay/{outTradeNo}",method = RequestMethod.POST)
197
+	@RequestMapping(value = "/wxCancelPay/{outTradeNo}",method = RequestMethod.GET)
198 198
 	public ResponseBean wxCancelPay(@PathVariable("outTradeNo") String outTradeNo, @RequestParam("type") String type,HttpSession session){
199 199
 		ResponseBean responseBean = new ResponseBean();
200 200
 		try {

+ 2
- 1
CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserLicenseServiceImpl.java View File

@@ -60,16 +60,17 @@ public class TaUserLicenseServiceImpl implements ITaUserLicenseService {
60 60
         int rows = 0;
61 61
         if (null == taUserLicense.getId()) {
62 62
             rows = taUserLicenseMapper.insertSelective(taUserLicense);
63
+            responseBean.addSuccess(taUserLicense);
63 64
         } else {
64 65
             taUserLicense.setUpdateUser(userElement.getId());
65 66
             taUserLicense.setUpdateDate(new Date());
66 67
             rows = taUserLicenseMapper.updateByPrimaryKeySelective(taUserLicense);
68
+            responseBean.addSuccess("当前小区已关联此车牌");
67 69
         }
68 70
 
69 71
 
70 72
         if (rows > 0) {
71 73
             taUserLicense.setUnitPrice(String.valueOf(Double.valueOf(taUserLicense.getUnitPrice()) / 100));
72
-            responseBean.addSuccess(taUserLicense);
73 74
             return responseBean;
74 75
         }
75 76