BMP
/
IntegralManager
mirror of https://gitee.com/bmpandlcm/IntegralManager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

主页，我的积分 接口里面添加返回参数

Browse Source
master
白美平 1 day ago
parent 41a4a5ece1
commit 29a79dcb41
3 changed files with 60 additions and 12 deletions
Show Stats Download Patch File Download Diff File

20
.idea/workspace.xml
Unescape Escape View File

@ -13,7 +13,7 @@
<list default="true" id="29bcb86b-1634-41e0-a498-79481163cba8" name="Changes" comment="修改附件上传接口，校验是否上传成功">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegralSignServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegralSignServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ServiceAreaServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ServiceAreaServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegrationListServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegrationListServiceImpl.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -119,7 +119,7 @@
"git-widget-placeholder": "master",
"go.import.settings.migrated": "true",
"kotlin-language-version-configured": "true",
"last_opened_file_path": "D:/workspace/IntegralManager",
"last_opened_file_path": "D:/workspace/bak/IntegralManager",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
@ -128,7 +128,7 @@
"project.structure.last.edited": "Modules",
"project.structure.proportion": "0.15",
"project.structure.side.proportion": "0.37169158",
"settings.editor.selected.configurable": "vcs.Subversion",
"settings.editor.selected.configurable": "MavenSettings",
"vue.rearranger.settings.migration": "true"
},
"keyToStringList": {
@ -656,7 +656,9 @@
<workItem from="1760148919195" duration="8085000" />
<workItem from="1760946026852" duration="6098000" />
<workItem from="1760953807434" duration="337000" />
<workItem from="1761095809116" duration="3066000" />
<workItem from="1761095809116" duration="5556000" />
<workItem from="1761210581203" duration="2148000" />
<workItem from="1763618527069" duration="4063000" />
</task>
<task id="LOCAL-00001" summary="特请处理">
<option name="closed" value="true" />
@ -946,7 +948,15 @@
<option name="project" value="LOCAL" />
<updated>1760165539298</updated>
</task>
<option name="localTasksCounter" value="37" />
<task id="LOCAL-00037" summary="修改附件上传接口，校验是否上传成功">
<option name="closed" value="true" />
<created>1761099787015</created>
<option name="number" value="00037" />
<option name="presentableId" value="LOCAL-00037" />
<option name="project" value="LOCAL" />
<updated>1761099787015</updated>
</task>
<option name="localTasksCounter" value="38" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">

2
src/main/java/com/nmgs/service/impl/IntegralSignServiceImpl.java
Unescape Escape View File

@ -269,7 +269,7 @@ public class IntegralSignServiceImpl implements IntegralSignService {
this.userTableMapper.updateUserById(userTableParams);
if ("Y".equals(PropertiesUtil.getValue("BAKEnabled"))) {
String bakDBType = PropertiesUtil.getValue("BakDBType");
integralListParams.put("DBTYPEBAK",bakDBType);
integralListParams.put("DBTYPEBAK",bakDBType);0
ret=this.userTableMysqlMapper.updateUserById(userTableParams);
}
LogUtil.WriteLog_Info("用户更新可用积分完成","QCodeInfoServiceImpl");

50
src/main/java/com/nmgs/service/impl/IntegrationListServiceImpl.java
Unescape Escape View File

@ -22,10 +22,27 @@ public class IntegrationListServiceImpl implements IntegrationListService {
" ROUND((ilt.RESTINTEGRATION/100),1) AS RESTINTEGRATION," +
" TO_CHAR(ilt.PAYTIME, 'YYYY-MM-DD HH24:MI:SS') AS PAYTIME," +
" ilt.BAK1,ilt.BAK2,ilt.BAK3," +
" pt.TEXT as PAYTYPENAME" +
" pt.TEXT as PAYTYPENAME," +
" saot.USERNAME as USERNAME," +
" sat.AREANAME as AREANAME," +
" saoct.COMPANYNAME as COMPANYNAME, " +
" vsc.ENNAME as ENNAME, " +
" vsc.EXNAME as EXNAME, " +
" to_char(vsc.ENTIME,'yyyy-MM-dd HH24:mi:ss') as ENTIME, " +
" to_char(vsc.EXTIME,'yyyy-MM-dd HH24:mi:ss') as EXTIME, " +
" SUBSTR(vsc.VEHICLEID,1,INSTR(vsc.VEHICLEID,'_')-1) as VEHICLEID, " +
" color.TEXT as COLOR, " +
" ROUND(vsc.LENGTH/1000,2) as LENGTH, " +
" case when sat.POSITION =1 then '东' when sat.POSITION =2 then '南' when sat.POSITION =3 then '西' when sat.POSITION =4 then '北' else '' end as POSITION " +
" from integration_list_table ilt " +
" left join peytype_text pt on(ilt.PAYTYPE = pt.value)" +
" left join WEIXN_USER_TABLE ut on(ilt.USERID = ut.ID)" +
" left join cafter_table ct on(ilt.ID = ct.INTEGRATIONLISTID)" +
" left join service_area_operators_table saot on(saot.JOBNUMBER = ct.USERJOBNUMBER)" +
" left join service_area_table sat on(sat.ID = saot.SERVICEAREAID)" +
" left join service_area_operators_company_text saoct on(saoct.ID = saot.COMPANYID)" +
" left join vehicle_score vsc on(vsc.INTEGRATIONLISTID = ilt.ID)" +
" left join platecolor_text color on color.VALUE = SUBSTR(vsc.VEHICLEID,INSTR(vsc.VEHICLEID,'_')+1)" +
" where 1=1 ";
static{
if("4".equals(DBType)){
@ -36,10 +53,27 @@ public class IntegrationListServiceImpl implements IntegrationListService {
" ROUND((ilt.RESTINTEGRATION/100),1) AS RESTINTEGRATION," +
" date_format(ilt.PAYTIME, '%Y-%m-%d %H:%i:%s') AS PAYTIME," +
" ilt.BAK1,ilt.BAK2,ilt.BAK3," +
" pt.TEXT as PAYTYPENAME" +
" pt.TEXT as PAYTYPENAME," +
" saot.USERNAME as USERNAME," +
" sat.AREANAME as AREANAME," +
" saoct.COMPANYNAME as COMPANYNAME, " +
" vsc.ENNAME as ENNAME, " +
" vsc.EXNAME as EXNAME, " +
" DATE_FORMAT(vsc.ENTIME,'%Y-%m-%d %H:%i:%S') as ENTIME, " +
" DATE_FORMAT(vsc.EXTIME,'%Y-%m-%d %H:%i:%S') as EXTIME, " +
" SUBSTR(vsc.VEHICLEID,1,INSTR(vsc.VEHICLEID,'_')-1) as VEHICLEID, " +
" color.TEXT as COLOR, " +
" ROUND(vsc.LENGTH/1000,2) as LENGTH, " +
" case when sat.POSITION =1 then '东' when sat.POSITION =2 then '南' when sat.POSITION =3 then '西' when sat.POSITION =4 then '北' else '' end as POSITION " +
" from integration_list_table ilt " +
" left join peytype_text pt on(ilt.PAYTYPE = pt.value)" +
" left join WEIXN_USER_TABLE ut on(ilt.USERID = ut.ID)" +
" left join cafter_table ct on(ilt.ID = ct.INTEGRATIONLISTID)" +
" left join service_area_operators_table saot on(saot.JOBNUMBER = ct.USERJOBNUMBER)" +
" left join service_area_table sat on(sat.ID = saot.SERVICEAREAID)" +
" left join service_area_operators_company_text saoct on(saoct.ID = saot.COMPANYID)" +
" left join vehicle_score vsc on(vsc.INTEGRATIONLISTID = ilt.ID)" +
" left join platecolor_text color on color.VALUE = SUBSTR(vsc.VEHICLEID,INSTR(vsc.VEHICLEID,'_')+1)" +
" where 1=1 ";
}
}
@ -47,6 +81,11 @@ public class IntegrationListServiceImpl implements IntegrationListService {
public List getIntegrationList(String userId, String aCarNo,String payType,int start,int end) {
List list=null;
String sqlTemp=sql;
String sqlResult="SELECT ID,USERID,COALESCE(ACARNO,'') as ACARNO,LASTINTEGRATION,PAYINTEGRATION,RESTINTEGRATION,PAYTIME," +
"PAYTYPENAME,COALESCE(BAK1,'') as BAK1,COALESCE(BAK2,'') as BAK2,COALESCE(BAK3,'') as BAK3,COALESCE(PAYTYPENAME,'') as PAYTYPENAME," +
"COALESCE(USERNAME,'') as USERNAME,COALESCE(AREANAME,'') as AREANAME,COALESCE(COMPANYNAME,'') as COMPANYNAME,COALESCE(ENNAME,'') as ENNAME," +
"COALESCE(EXNAME,'') as EXNAME,COALESCE(ENTIME,'') as ENTIME,COALESCE(EXTIME,'') as EXTIME," +
"COALESCE(VEHICLEID,'') as VEHICLEID,COALESCE(COLOR,'') as COLOR,COALESCE(LENGTH,'') as LENGTH,COALESCE(POSITION,'') as POSITION ";
try{
if("2".equals(DBType)){
sqlTemp += " and ut.OPENID = '"+userId+"'";
@ -65,8 +104,8 @@ public class IntegrationListServiceImpl implements IntegrationListService {
if(start==0 && end==0){
list= this.mapperI.selectforlist(sqlTemp);
}else{
String startSql="SELECT ID,USERID,ACARNO,LASTINTEGRATION,PAYINTEGRATION,RESTINTEGRATION,PAYTIME," +
"PAYTYPENAME,BAK1,BAK2,BAK3 FROM("+sqlTemp+")tt where tt.num <= "+end;
String startSql=sqlResult +
"FROM("+sqlTemp+")tt where tt.num <= "+end;
list= this.mapperI.selectforlist(startSql);
}
}else if("4".equals(DBType)){//mysql数据库
@ -86,8 +125,7 @@ public class IntegrationListServiceImpl implements IntegrationListService {
if(start==0 && end==0){
list= this.mapperI.selectforlist(sqlTemp);
}else{
String startSql="SELECT ID,USERID,ACARNO,LASTINTEGRATION,PAYINTEGRATION,RESTINTEGRATION,PAYTIME," +
"PAYTYPENAME,BAK1,BAK2,BAK3 FROM("+sqlTemp+")tt";
String startSql=sqlResult+" FROM("+sqlTemp+")tt";
list= this.mapperI.selectforlist(startSql);
}
}else{}

Write Preview
Loading…
Cancel
Save