Merge branch 'master' of hyq/cuspay into master

src/main/java/com/emato/cuspay/web/controller/wx/WxCusController.java

@@ -55,25 +55,17 @@ public class WxCusController {
      * @return
      */
     @RequestMapping(value = "/wxcbpay", method = RequestMethod.POST)
-    public ResponseMessage addWxCbPayDoc(HttpServletRequest request ) {
+    public ResponseMessage addWxCbPayDoc(HttpServletRequest request) {
         logger.info("支付单信息入库接口请求开始");
-        String result = request.getParameter("result");
+        String data = request.getParameter("data");
         // 检查参数是否齐全
-        if (Strings.isNullOrEmpty(result)) {
-            return  new ResponseMessage.Builder().setCode(ResponseStatus.ERROR.getItem()).setMsg("result不能为空").build();
+        if (Strings.isNullOrEmpty(data)) {
+            return  new ResponseMessage.Builder().setCode(ResponseStatus.ERROR.getItem()).setMsg("缺少业务数据").build();
         }
-        logger.info("支付单信息入库接口请求数据:【{}】",result);
+        logger.info("支付单信息入库接口请求数据:【{}】",data);
 
         //解析数据
-        RequestMessage requestMessage = JacksonUtil.fromStringJson(result, RequestMessage.class);
-        List<WxCbPayDoc> list = null;
-        if(requestMessage != null){
-            list = (List<WxCbPayDoc>) requestMessage.getData();
-            if(list.size() == 0){
-                return  new ResponseMessage.Builder().setCode(ResponseStatus.ERROR.getItem()).setMsg("缺少业务数据").build();
-            }
-        }
-        List<WxCbPayDoc> wxCbPayDocList = JacksonUtil.fromListJson(JacksonUtil.toJson(list), new TypeReference<List<WxCbPayDoc>>(){});
+        List<WxCbPayDoc> wxCbPayDocList = JacksonUtil.fromListJson(data, new TypeReference<List<WxCbPayDoc>>(){});
         WxCbPayDoc wxCbPayDoc = null;
         if (wxCbPayDocList != null && wxCbPayDocList.size() > 0){
             wxCbPayDoc = wxCbPayDocList.get(0);