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

积分流水ID步长由1改为10

Browse Source
master
白美平 9 months ago
parent 39f15fd3fd
commit 4ea2506082
3 changed files with 86 additions and 69 deletions
Show Stats Download Patch File Download Diff File

123
.idea/workspace.xml
Unescape Escape View File

@ -10,10 +10,9 @@
</component>
<component name="ChangeListManager">
<list default="true" id="29bcb86b-1634-41e0-a498-79481163cba8" name="Changes" comment="打开项目报错了，删除了不需要的引用">
<change beforePath="$PROJECT_DIR$/.idea/dataSources/7d9d4f54-fadf-4993-9e3f-0bc7162a4ac7.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/IntegraManager.iml" beforeDir="false" afterPath="$PROJECT_DIR$/IntegraManager.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/controller/QcodeInfoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/controller/QcodeInfoController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ApponintmentInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ApponintmentInfoServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/QCodeInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/QCodeInfoServiceImpl.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -76,57 +75,57 @@
<component name="ProjectViewState">
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"Application.DivPassDataImpl.executor": "Run",
"Application.ImageUtils.executor": "Run",
"Application.PubTools.executor": "Run",
"Application.QCodeInfoServiceImpl.executor": "Debug",
"Application.SensitiveFilter.executor": "Run",
"Application.main.executor": "Run",
"Application.redisConfigUtil.executor": "Debug",
"Maven.IntegraManager [clean].executor": "Run",
"Maven.IntegraManager [install].executor": "Run",
"Maven.IntegralManager [clean].executor": "Run",
"Maven.IntegralManager [install].executor": "Run",
"Maven.IntegralManager [validate].executor": "Run",
"Maven.IntegralManagerSys [clean].executor": "Run",
"Maven.IntegralManagerSys [install].executor": "Run",
"Maven.devProject [clean].executor": "Run",
"Maven.devProject [install].executor": "Run",
"Maven.dev_project [clean].executor": "Run",
"Maven.dev_project [install].executor": "Run",
"Maven.special_event [clean].executor": "Run",
"Maven.special_event [install].executor": "Run",
"Maven.special_event [org.apache.maven.plugins:maven-assembly-plugin:3.3.0:single].executor": "Run",
"Maven.special_event [org.springframework.boot:spring-boot-maven-plugin:2.7.11:repackage].executor": "Run",
"Maven.special_event [package].executor": "Run",
"Maven.special_event [validate].executor": "Run",
"RunOnceActivity.OpenProjectViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"TomEE Server.special_event.executor": "Debug",
"Tomcat Server.Tomcat 9.0.80.executor": "Debug",
"deletionFromPopupRequiresConfirmation": "false",
"git-widget-placeholder": "master",
"kotlin-language-version-configured": "true",
"last_opened_file_path": "D:/workspace/IntegralManager",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
"node.js.selected.package.tslint": "(autodetect)",
"nodejs_package_manager_path": "npm",
"project.structure.last.edited": "Modules",
"project.structure.proportion": "0.15",
"project.structure.side.proportion": "0.37169158",
"settings.editor.selected.configurable": "reference.settings.project.maven.importing",
"vue.rearranger.settings.migration": "true"
<component name="PropertiesComponent">{
&quot;keyToString&quot;: {
&quot;Application.DivPassDataImpl.executor&quot;: &quot;Run&quot;,
&quot;Application.ImageUtils.executor&quot;: &quot;Run&quot;,
&quot;Application.PubTools.executor&quot;: &quot;Run&quot;,
&quot;Application.QCodeInfoServiceImpl.executor&quot;: &quot;Debug&quot;,
&quot;Application.SensitiveFilter.executor&quot;: &quot;Run&quot;,
&quot;Application.main.executor&quot;: &quot;Run&quot;,
&quot;Application.redisConfigUtil.executor&quot;: &quot;Debug&quot;,
&quot;Maven.IntegraManager [clean].executor&quot;: &quot;Run&quot;,
&quot;Maven.IntegraManager [install].executor&quot;: &quot;Run&quot;,
&quot;Maven.IntegralManager [clean].executor&quot;: &quot;Run&quot;,
&quot;Maven.IntegralManager [install].executor&quot;: &quot;Run&quot;,
&quot;Maven.IntegralManager [validate].executor&quot;: &quot;Run&quot;,
&quot;Maven.IntegralManagerSys [clean].executor&quot;: &quot;Run&quot;,
&quot;Maven.IntegralManagerSys [install].executor&quot;: &quot;Run&quot;,
&quot;Maven.devProject [clean].executor&quot;: &quot;Run&quot;,
&quot;Maven.devProject [install].executor&quot;: &quot;Run&quot;,
&quot;Maven.dev_project [clean].executor&quot;: &quot;Run&quot;,
&quot;Maven.dev_project [install].executor&quot;: &quot;Run&quot;,
&quot;Maven.special_event [clean].executor&quot;: &quot;Run&quot;,
&quot;Maven.special_event [install].executor&quot;: &quot;Run&quot;,
&quot;Maven.special_event [org.apache.maven.plugins:maven-assembly-plugin:3.3.0:single].executor&quot;: &quot;Run&quot;,
&quot;Maven.special_event [org.springframework.boot:spring-boot-maven-plugin:2.7.11:repackage].executor&quot;: &quot;Run&quot;,
&quot;Maven.special_event [package].executor&quot;: &quot;Run&quot;,
&quot;Maven.special_event [validate].executor&quot;: &quot;Run&quot;,
&quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
&quot;TomEE Server.special_event.executor&quot;: &quot;Debug&quot;,
&quot;Tomcat Server.Tomcat 9.0.80.executor&quot;: &quot;Debug&quot;,
&quot;deletionFromPopupRequiresConfirmation&quot;: &quot;false&quot;,
&quot;git-widget-placeholder&quot;: &quot;master&quot;,
&quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
&quot;last_opened_file_path&quot;: &quot;D:/workspace/IntegralManager&quot;,
&quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
&quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
&quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
&quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
&quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
&quot;project.structure.last.edited&quot;: &quot;Modules&quot;,
&quot;project.structure.proportion&quot;: &quot;0.15&quot;,
&quot;project.structure.side.proportion&quot;: &quot;0.37169158&quot;,
&quot;settings.editor.selected.configurable&quot;: &quot;reference.settings.project.maven.importing&quot;,
&quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
},
"keyToStringList": {
"DatabaseDriversLRU": [
"oracle"
&quot;keyToStringList&quot;: {
&quot;DatabaseDriversLRU&quot;: [
&quot;oracle&quot;
]
}
}]]></component>
}</component>
<component name="ReactorSettings">
<option name="notificationShown" value="true" />
</component>
@ -536,7 +535,9 @@
<workItem from="1735284453688" duration="36000" />
<workItem from="1736056909220" duration="153000" />
<workItem from="1738986812804" duration="1335000" />
<workItem from="1739866933321" duration="1266000" />
<workItem from="1739866933321" duration="3528000" />
<workItem from="1739933270638" duration="29000" />
<workItem from="1740453934628" duration="2221000" />
</task>
<task id="LOCAL-00001" summary="特请处理">
<option name="closed" value="true" />
@ -714,7 +715,23 @@
<option name="project" value="LOCAL" />
<updated>1739869643306</updated>
</task>
<option name="localTasksCounter" value="23" />
<task id="LOCAL-00023" summary="打开项目报错了，删除了不需要的引用">
<option name="closed" value="true" />
<created>1739869849159</created>
<option name="number" value="00023" />
<option name="presentableId" value="LOCAL-00023" />
<option name="project" value="LOCAL" />
<updated>1739869849159</updated>
</task>
<task id="LOCAL-00024" summary="打开项目报错了，删除了不需要的引用">
<option name="closed" value="true" />
<created>1739870419806</created>
<option name="number" value="00024" />
<option name="presentableId" value="LOCAL-00024" />
<option name="project" value="LOCAL" />
<updated>1739870419806</updated>
</task>
<option name="localTasksCounter" value="25" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">

12
src/main/java/com/nmgs/service/impl/ApponintmentInfoServiceImpl.java
Unescape Escape View File

@ -377,7 +377,7 @@ public class ApponintmentInfoServiceImpl implements AppointmentInfoService {
String cafterSql = "INSERT INTO integration_list_table ( ID, USERID, LASTINTEGRATION, PAYINTEGRATION, RESTINTEGRATION, PAYTIME, PAYTYPE,OGENABLEINTEGRATION,CPENABLEINTEGRATION )\n" +
"VALUES\n" +
"\t(\n" +
"\t\t" + (maxId + 1) + ",\n" +
"\t\t" + (maxId + 10) + ",\n" +
"\t\t" + userIdNew + ",\n" +
"\t\t" + PubTools.doubleSave1(lastEnabled * 100) + ",\n" +
"\t\t" + PubTools.doubleSave1(consumeInteger * 100) + ",\n" +
@ -388,7 +388,7 @@ public class ApponintmentInfoServiceImpl implements AppointmentInfoService {
cafterSql = "INSERT INTO integration_list_table ( ID, USERID, LASTINTEGRATION, PAYINTEGRATION, RESTINTEGRATION, PAYTIME, PAYTYPE,OGENABLEINTEGRATION,CPENABLEINTEGRATION )\n" +
"VALUES\n" +
"\t(\n" +
"\t\t" + (maxId + 1) + ",\n" +
"\t\t" + (maxId + 10) + ",\n" +
"\t\t" + userIdNew + ",\n" +
"\t\t" + PubTools.doubleSave1(lastEnabled * 100) + ",\n" +
"\t\t" + PubTools.doubleSave1(consumeInteger * 100) + ",\n" +
@ -403,9 +403,9 @@ public class ApponintmentInfoServiceImpl implements AppointmentInfoService {
this.mapperI.insert(cafterSql);
lastEnabled = lastEnabled - consumeInteger;
if (PubTools.isNull(integralListId)) {
integralListId = (maxId + 1) + "";
integralListId = (maxId + 10) + "";
} else {
integralListId += "," + (maxId + 1);
integralListId += "," + (maxId + 10);
}
LogUtil.WriteLog_Info("积分核减=====积分流水已插入", "ApponintmentInfoServiceImpl");
//2、新加一条消费记录
@ -418,7 +418,7 @@ public class ApponintmentInfoServiceImpl implements AppointmentInfoService {
"INTEGRATIONLISTID,\n" +
"ORDERID) values (\n" +
" (select COALESCE(max(t.ID),0)+1 from CAFTER_TABLE t),''," +
"" + userIdNew + ",to_date('" + rollbackTime + "','yyyy-MM-dd HH24:mi:ss'),'" + jobNumber + "','SUCCESS'," + (maxId + 1) + ",'" + operatorId + "'" +
"" + userIdNew + ",to_date('" + rollbackTime + "','yyyy-MM-dd HH24:mi:ss'),'" + jobNumber + "','SUCCESS'," + (maxId + 10) + ",'" + operatorId + "'" +
")";
if ("4".equals(DBType)) {
sqlIntegralList = "insert into CAFTER_TABLE(ID,\n" +
@ -430,7 +430,7 @@ public class ApponintmentInfoServiceImpl implements AppointmentInfoService {
"INTEGRATIONLISTID,\n" +
"ORDERID) values (\n" +
" (select COALESCE(max(t.ID),0)+1 from CAFTER_TABLE t),''," +
"" + userIdNew + ",str_to_date('" + rollbackTime + "','%Y-%m-%d %H:%i:%s'),'" + jobNumber + "','SUCCESS'," + (maxId + 1) + ",'" + jobNumber + "'" +
"" + userIdNew + ",str_to_date('" + rollbackTime + "','%Y-%m-%d %H:%i:%s'),'" + jobNumber + "','SUCCESS'," + (maxId + 10) + ",'" + jobNumber + "'" +
")";
}
this.mapperI.insert(sqlIntegralList);

20
src/main/java/com/nmgs/service/impl/QCodeInfoServiceImpl.java
Unescape Escape View File

@ -585,7 +585,7 @@ public class QCodeInfoServiceImpl {
String cafterSql = "INSERT INTO integration_list_table ( ID, USERID, LASTINTEGRATION, PAYINTEGRATION, RESTINTEGRATION, PAYTIME, PAYTYPE,OGENABLEINTEGRATION,CPENABLEINTEGRATION )\n" +
"VALUES\n" +
"\t(\n" +
"\t\t" + (maxId + 1) + ",\n" +
"\t\t" + (maxId + 10) + ",\n" +
"\t\t"+userIdNew+",\n" +
"\t\t" + PubTools.doubleSave1(Double.parseDouble(ENABLEINTEGRATION) * 100) + ",\n" +
"\t\t" + PubTools.doubleSave1(rebateIntegrateSave * 100) + ",\n" +
@ -596,7 +596,7 @@ public class QCodeInfoServiceImpl {
cafterSql = "INSERT INTO integration_list_table ( ID, USERID, LASTINTEGRATION, PAYINTEGRATION, RESTINTEGRATION, PAYTIME, PAYTYPE,OGENABLEINTEGRATION,CPENABLEINTEGRATION )\n" +
"VALUES\n" +
"\t(\n" +
"\t\t" + (maxId + 1) + ",\n" +
"\t\t" + (maxId + 10) + ",\n" +
"\t\t"+userIdNew+",\n" +
"\t\t" + PubTools.doubleSave1(Double.parseDouble(ENABLEINTEGRATION) * 100) + ",\n" +
"\t\t" + PubTools.doubleSave1(rebateIntegrateSave * 100) + ",\n" +
@ -629,7 +629,7 @@ public class QCodeInfoServiceImpl {
"INTEGRATIONLISTID,\n" +
"ORDERID,CONTENT) values (\n" +
" (select COALESCE(max(t.ID),0)+1 from CAFTER_TABLE t),''," +
""+userIdNew+",to_date('" + rollbackTime + "','yyyy-MM-dd HH24:mi:ss'),'" + serverOperationId + "','SUCCESS'," + (maxId + 1) + ",'" + orderId + "','" + content + "'" +
"" + userIdNew + ",to_date('" + rollbackTime + "','yyyy-MM-dd HH24:mi:ss'),'" + serverOperationId + "','SUCCESS'," + (maxId + 10) + ",'" + orderId + "','" + content + "'" +
")";
if("4".equals(DBType)){
sqlIntegralList = "insert into CAFTER_TABLE(ID,\n" +
@ -641,7 +641,7 @@ public class QCodeInfoServiceImpl {
"INTEGRATIONLISTID,\n" +
"ORDERID,CONTENT) values (\n" +
" (select COALESCE(max(t.ID),0)+1 from CAFTER_TABLE t),''," +
""+userIdNew+",str_to_date('" + rollbackTime + "','%Y-%m-%d %H:%i:%s'),'" + serverOperationId + "','SUCCESS'," + (maxId + 1) + ",'" + orderId + "','" + content + "'" +
"" + userIdNew + ",str_to_date('" + rollbackTime + "','%Y-%m-%d %H:%i:%s'),'" + serverOperationId + "','SUCCESS'," + (maxId + 10) + ",'" + orderId + "','" + content + "'" +
")";
}
this.mapperI.insert(sqlIntegralList);
@ -657,7 +657,7 @@ public class QCodeInfoServiceImpl {
if(appointList.size()>0){
Map<String,Object> map=(Map<String,Object>)appointList.get(0);
int appointId=Integer.parseInt(map.get("ID").toString());
String updateAppointSql="UPDATE APPOINTMENT_INFO_TABLE SET COMPLETESTATUS='Y',INTEGRATIONLISTID="+(maxId + 1)+" WHERE ID="+appointId+"";
String updateAppointSql="UPDATE APPOINTMENT_INFO_TABLE SET COMPLETESTATUS='Y',INTEGRATIONLISTID="+(maxId + 10)+" WHERE ID="+appointId+"";
this.mapperI.update(updateAppointSql);
LogUtil.WriteLog_Info("积分核减=====修改预约记录为已核销", "QCodeInfoServiceImpl");
}
@ -1499,7 +1499,7 @@ public class QCodeInfoServiceImpl {
String cafterSql = "INSERT INTO integration_list_table ( ID, USERID, LASTINTEGRATION, PAYINTEGRATION, RESTINTEGRATION, PAYTIME, PAYTYPE,OGENABLEINTEGRATION,CPENABLEINTEGRATION )\n" +
"VALUES\n" +
"\t(\n" +
"\t\t" + (maxId + 1) + ",\n" +
"\t\t" + (maxId + 10) + ",\n" +
"\t\t"+userIdNew+",\n" +
"\t\t" + PubTools.doubleSave1(Double.parseDouble(ENABLEINTEGRATION) * 100) + ",\n" +
"\t\t" + PubTools.doubleSave1(rebateIntegrateSave * 100) + ",\n" +
@ -1510,7 +1510,7 @@ public class QCodeInfoServiceImpl {
cafterSql = "INSERT INTO integration_list_table ( ID, USERID, LASTINTEGRATION, PAYINTEGRATION, RESTINTEGRATION, PAYTIME, PAYTYPE,OGENABLEINTEGRATION,CPENABLEINTEGRATION )\n" +
"VALUES\n" +
"\t(\n" +
"\t\t" + (maxId + 1) + ",\n" +
"\t\t" + (maxId + 10) + ",\n" +
"\t\t"+userIdNew+",\n" +
"\t\t" + PubTools.doubleSave1(Double.parseDouble(ENABLEINTEGRATION) * 100) + ",\n" +
"\t\t" + PubTools.doubleSave1(rebateIntegrateSave * 100) + ",\n" +
@ -1543,7 +1543,7 @@ public class QCodeInfoServiceImpl {
"INTEGRATIONLISTID,\n" +
"ORDERID,CONTENT) values (\n" +
" (select COALESCE(max(t.ID),0)+1 from CAFTER_TABLE t),''," +
""+userIdNew+",to_date('" + rollbackTime + "','yyyy-MM-dd HH24:mi:ss'),'" + serverOperationId + "','SUCCESS'," + (maxId + 1) + ",'" + orderId + "','" + content + "'" +
"" + userIdNew + ",to_date('" + rollbackTime + "','yyyy-MM-dd HH24:mi:ss'),'" + serverOperationId + "','SUCCESS'," + (maxId + 10) + ",'" + orderId + "','" + content + "'" +
")";
if("4".equals(DBType)){
sqlIntegralList = "insert into CAFTER_TABLE(ID,\n" +
@ -1555,7 +1555,7 @@ public class QCodeInfoServiceImpl {
"INTEGRATIONLISTID,\n" +
"ORDERID,CONTENT) values (\n" +
" (select COALESCE(max(t.ID),0)+1 from CAFTER_TABLE t),''," +
""+userIdNew+",str_to_date('" + rollbackTime + "','%Y-%m-%d %H:%i:%s'),'" + serverOperationId + "','SUCCESS'," + (maxId + 1) + ",'" + orderId + "','" + content + "'" +
"" + userIdNew + ",str_to_date('" + rollbackTime + "','%Y-%m-%d %H:%i:%s'),'" + serverOperationId + "','SUCCESS'," + (maxId + 10) + ",'" + orderId + "','" + content + "'" +
")";
}
this.mapperI.insert(sqlIntegralList);
@ -1571,7 +1571,7 @@ public class QCodeInfoServiceImpl {
if(appointList.size()>0){
Map<String,Object> map=(Map<String,Object>)appointList.get(0);
int appointId=Integer.parseInt(map.get("ID").toString());
String updateAppointSql="UPDATE APPOINTMENT_INFO_TABLE SET COMPLETESTATUS='Y',INTEGRATIONLISTID="+(maxId + 1)+" WHERE ID="+appointId+"";
String updateAppointSql="UPDATE APPOINTMENT_INFO_TABLE SET COMPLETESTATUS='Y',INTEGRATIONLISTID="+(maxId + 10)+" WHERE ID="+appointId+"";
this.mapperI.update(updateAppointSql);
LogUtil.WriteLog_Info("积分核减=====修改预约记录为已核销", "QCodeInfoServiceImpl");
}

Write Preview
Loading…
Cancel
Save