Authored by mingdan.ge

cps马甲

@@ -109,6 +109,7 @@ @@ -109,6 +109,7 @@
109 <value>/UnionShareRest/dealExtraActivityTask</value> 109 <value>/UnionShareRest/dealExtraActivityTask</value>
110 <value>/UnionShareRest/clearActivity</value> 110 <value>/UnionShareRest/clearActivity</value>
111 <value>/UnionShareRest/getStatisticsInfo</value> 111 <value>/UnionShareRest/getStatisticsInfo</value>
  112 + <value>/UnionShareRest/queryUnionShareOrdersMonthList</value>
112 113
113 </list> 114 </list>
114 </property> 115 </property>
@@ -2365,6 +2365,7 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport @@ -2365,6 +2365,7 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
2365 month.setDate(dateInt); 2365 month.setDate(dateInt);
2366 month.setUpdateTime(DateUtil.getCurrentTimeSecond()); 2366 month.setUpdateTime(DateUtil.getCurrentTimeSecond());
2367 month.setUid(promoteUid); 2367 month.setUid(promoteUid);
  2368 + month.setAlias(Integer.toString(promoteUid));
2368 if (unionShareOrdersMonth != null) { 2369 if (unionShareOrdersMonth != null) {
2369 //月预估收益更新 2370 //月预估收益更新
2370 month.setId(unionShareOrdersMonth.getId()); 2371 month.setId(unionShareOrdersMonth.getId());
@@ -33,8 +33,8 @@ @@ -33,8 +33,8 @@
33 <input class="easyui-textbox" id="beginDate" name="beginDate" data-options="prompt:'格式:201808'"/>~&nbsp;&nbsp; 33 <input class="easyui-textbox" id="beginDate" name="beginDate" data-options="prompt:'格式:201808'"/>~&nbsp;&nbsp;
34 <input class="easyui-textbox" id="endDate" name="endDate" data-options="prompt:'格式:201808'"/> 34 <input class="easyui-textbox" id="endDate" name="endDate" data-options="prompt:'格式:201808'"/>
35 <a id="searchBtn" style="margin-left: 20px" class="easyui-linkbutton btn-primary" data-options="iconCls:'icon-more'">查询</a> 35 <a id="searchBtn" style="margin-left: 20px" class="easyui-linkbutton btn-primary" data-options="iconCls:'icon-more'">查询</a>
36 - <a id="importButton" style="margin-left: 20px" class="easyui-linkbutton btn-primary" data-options="iconCls:'icon-more'">导入</a>  
37 - <a id="randomButton" style="margin-left: 20px" class="easyui-linkbutton btn-primary" data-options="iconCls:'icon-more'">随机增</a> 36 + <a id="importButton" style="margin-left: 20px" class="easyui-linkbutton btn-primary" data-options="iconCls:'icon-more'">导入马甲数据</a>
  37 + <a id="randomButton" style="margin-left: 20px" class="easyui-linkbutton btn-primary" data-options="iconCls:'icon-more'">马甲随机增</a>
38 </div> 38 </div>
39 39
40 </form> 40 </form>
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
51 fit: true, 51 fit: true,
52 fitColumns: true, 52 fitColumns: true,
53 nowrap: false, 53 nowrap: false,
54 - url: contextPath + "/UnionShareRest/queryUnionShareOrdersMonthList/?debug=XYZ", 54 + url: contextPath + "/UnionShareRest/queryUnionShareOrdersMonthList",
55 method: 'POST', 55 method: 'POST',
56 loadFilter: function (data) { 56 loadFilter: function (data) {
57 var temp = defaultLoadFilter(data); 57 var temp = defaultLoadFilter(data);