From 8052ca7dbbaa93380de5da95b244d5d5723da16f Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sat, 16 Feb 2019 17:37:29 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E5=BC=80=E5=8F=91=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0][=E4=BF=AE=E6=94=B9]:=E6=89=A9=E5=B1=95=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/domain/po/WxWeappExtSet.java | 12 ++++++------ .../main/resources/mapper/WxWeappExtSetMapper.xml | 6 +++--- .../iformall/controller/WxWeappInfoController.java | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java index 7f8477a05..5372cb16e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappExtSet.java @@ -28,11 +28,11 @@ public class WxWeappExtSet implements Serializable { @io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端)",name="type") private Integer type; /**小程序扩展信息*/ - @io.swagger.annotations.ApiModelProperty(value="小程序扩展信息",name="ext") - private String ext; + @io.swagger.annotations.ApiModelProperty(value="小程序扩展信息",name="extJson") + private String extJson; /**提交审核列表*/ - @io.swagger.annotations.ApiModelProperty(value="提交审核列表",name="release") - private String release; + @io.swagger.annotations.ApiModelProperty(value="提交审核列表",name="releaseJson") + private String releaseJson; /**创建时间*/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; @@ -47,8 +47,8 @@ public class WxWeappExtSet implements Serializable { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") ,AppId_ASC("`app_id` ASC"),AppId_DESC("`app_id` DESC") ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") - ,Ext_ASC("`ext` ASC"),Ext_DESC("`ext` DESC") - ,Release_ASC("`release` ASC"),Release_DESC("`release` DESC") + ,ExtJson_ASC("`ext_json` ASC"),ExtJson_DESC("`ext_json` DESC") + ,ReleaseJson_ASC("`release_json` ASC"),ReleaseJson_DESC("`release_json` DESC") ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") ; diff --git a/mallinkService/src/main/resources/mapper/WxWeappExtSetMapper.xml b/mallinkService/src/main/resources/mapper/WxWeappExtSetMapper.xml index 376d8b98a..71de37b6a 100644 --- a/mallinkService/src/main/resources/mapper/WxWeappExtSetMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxWeappExtSetMapper.xml @@ -5,14 +5,14 @@ - - + + - `id`,`app_id`,`type`,`ext`,`release`,`create_date`,`update_date` + `id`,`app_id`,`type`,`ext_json`,`release_json`,`create_date`,`update_date` diff --git a/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java b/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java index 047eed213..3df8f347a 100644 --- a/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java +++ b/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java @@ -267,7 +267,7 @@ public class WxWeappInfoController extends BaseController { // code commit try { Gson gson= new GsonBuilder().create(); - WxMaOpenCommitExtInfo extInfo = gson.fromJson(extSet.getExt(), new TypeToken() { }.getType()); + WxMaOpenCommitExtInfo extInfo = gson.fromJson(extSet.getExtJson(), new TypeToken() { }.getType()); WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(extInfo.getExtAppid()); logger.info(extInfo.toString()); WxOpenResult openRet = openMaService.codeCommit(templateId, userVersion, userDesc, extInfo); @@ -292,7 +292,7 @@ public class WxWeappInfoController extends BaseController { // 提交审核 if(codeCommitStatus) { try { - WxOpenMaSubmitAuditMessage subMessage = JSON.parseObject(extSet.getRelease(), WxOpenMaSubmitAuditMessage.class); + WxOpenMaSubmitAuditMessage subMessage = JSON.parseObject(extSet.getReleaseJson(), WxOpenMaSubmitAuditMessage.class); WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId); WxOpenMaSubmitAuditResult openRet = openMaService.submitAudit(subMessage); logger.info(openRet.toString());