Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
A
Aidea
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sa_aidea
Aidea
Commits
48ebf1bd
Commit
48ebf1bd
authored
Nov 11, 2020
by
谢希宇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Aidea product update by Strive Date 2020-11-11
parent
f2969b5e
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
10 deletions
+12
-10
ConsultSheetMapper.xml
...lasses/com/cftech/consultsheet/dao/ConsultSheetMapper.xml
+9
-7
AddressServiceImpl.java
.../com/cftech/addresst/service/impl/AddressServiceImpl.java
+1
-1
MobileAddressController.java
...java/com/cftech/addresst/web/MobileAddressController.java
+1
-1
MobileWxJsController.java
...in/java/com/cftech/mp/reply/web/MobileWxJsController.java
+1
-1
No files found.
aidea-modules/consult-module/target/classes/com/cftech/consultsheet/dao/ConsultSheetMapper.xml
View file @
48ebf1bd
...
...
@@ -197,14 +197,13 @@
<if
test=
"sort!=null"
>
ORDER BY ${sort.param} ${sort.type}
</if>
<if
test=
"limit>0"
>
limit #{offset},#{limit}
</if>
</select>
<select
id=
"consultSheetList"
resultType=
"com.cftech.consultsheet.model.ConsultSheet"
>
SELECT
<include
refid=
"sqlCol"
/>
from t_aidea_consult_sheet
where del_flag = 0
<if
test=
"openid!=null"
>
and open_id = {openid}
and open_id =
#
{openid}
</if>
<if
test=
"name!=null and name !=''"
>
and user_name like concat('%',#{name},'%')
...
...
@@ -212,7 +211,10 @@
<if
test=
"id!=null"
>
and id = #{id}
</if>
ORDER BY create_time
ORDER BY create_time DESC
<if
test=
"page!=null and pageSize !='' and pageSize!=null and page !=''"
>
limit #{page},#{pageSize}
</if>
</select>
<update
id=
"update"
parameterType=
"com.cftech.consultsheet.model.ConsultSheet"
>
...
...
membercard-modules/shipping-address-module/src/main/java/com/cftech/addresst/service/impl/AddressServiceImpl.java
View file @
48ebf1bd
...
...
@@ -51,7 +51,7 @@ public class AddressServiceImpl extends GenericServiceImpl<Address> implements A
}
@Override
public
JSONObject
addressList
(
String
openId
,
String
appId
)
{
public
JSONObject
addressList
(
String
openId
,
String
appId
)
{
JSONObject
rtnJson
=
new
JSONObject
();
try
{
...
...
membercard-modules/shipping-address-module/src/main/java/com/cftech/addresst/web/MobileAddressController.java
View file @
48ebf1bd
...
...
@@ -37,7 +37,7 @@ public class MobileAddressController {
* @Param
**/
@RequestMapping
(
value
=
"/addressList"
,
method
=
{
RequestMethod
.
GET
,
RequestMethod
.
POST
},
produces
=
MediaType
.
APPLICATION_JSON_UTF8_VALUE
)
public
JSONObject
addressList
(
String
openId
,
String
appId
)
{
public
JSONObject
addressList
(
String
openId
,
String
appId
)
{
return
addressService
.
addressList
(
openId
,
appId
);
}
...
...
mp-modules/mp-message-module/src/main/java/com/cftech/mp/reply/web/MobileWxJsController.java
View file @
48ebf1bd
...
...
@@ -152,7 +152,7 @@ public class MobileWxJsController {
* @param request
* @return
*/
@RequestMapping
(
value
=
"signature"
,
method
=
RequestMethod
.
GE
T
,
produces
=
{
"application/json;charset=UTF-8"
})
@RequestMapping
(
value
=
"signature"
,
method
=
RequestMethod
.
POS
T
,
produces
=
{
"application/json;charset=UTF-8"
})
public
String
signature
(
String
appid
,
HttpServletRequest
request
){
return
wxJsSdkService
.
getParam
(
appid
,
request
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment