From 9900d2ccb0b75b445459dafc9e28812db4da6f6e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 12 八月 2019 10:32:04 +0800
Subject: [PATCH] 商品更新规则修改
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java
index 10c654d..0c98971 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java
@@ -39,6 +39,7 @@
import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanDrawBackService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanOrderService;
import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;
+import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
@@ -87,6 +88,9 @@
@Resource
private UserMoneyDebtService userMoneyDebtService;
+
+ @Resource
+ private UserSystemCouponRecordService userSystemCouponRecordService;
/**
* 缁熻鍘嗗彶璁㈠崟-娣樺疂璁㈠崟
@@ -139,9 +143,9 @@
* @param out
*/
@RequestMapping(value = "getUserOrderList")
- public void getUserOrderList(String callback, Integer pageIndex, Integer pageSize, Integer keyType,
- String key, Integer state, Integer type, Integer orderState, String startTime, String endTime,
- Integer sourceType, PrintWriter out) {
+ public void getUserOrderList(String callback, Integer pageIndex, Integer pageSize, Integer keyType, String key,
+ Integer state, Integer type, Integer orderState, String startTime, String endTime, Integer sourceType,
+ PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
@@ -167,8 +171,9 @@
List<CommonOrderVO> list = commonOrderService.listQuery((pageIndex - 1) * pageSize, pageSize, keyType, key,
state, type, orderState, startTime, endTime, sourceType);
- // 缁熻鎬绘暟
- long count = commonOrderService.countQuery(keyType, key, state, type, orderState, startTime, endTime, sourceType);
+ // 缁熻鎬绘暟
+ long count = commonOrderService.countQuery(keyType, key, state, type, orderState, startTime, endTime,
+ sourceType);
// 鏌ヨ鏄惁缁存潈
for (CommonOrderVO order : list) {
@@ -221,7 +226,7 @@
UserMoneyDebtTypeEnum.order, hongBaoOrder.getHongBaoV2().getId());
if (debt != null && debt.getLeftMoney().compareTo(new BigDecimal(0)) > 0) {
order.setWeiQuanBackMoney(
- new BigDecimal(0).subtract(debt.getLeftMoney()).toString());//鏈墸闄�
+ new BigDecimal(0).subtract(debt.getLeftMoney()).toString());// 鏈墸闄�
}
}
}
@@ -731,8 +736,8 @@
* @param out
*/
@RequestMapping(value = "getTrackAccuracyRate")
- public void getTrackAccuracyRate(String callback, Integer dateType, String year, String startTime, String endTime,int sourceType,
- PrintWriter out) {
+ public void getTrackAccuracyRate(String callback, Integer dateType, String year, String startTime, String endTime,
+ int sourceType, PrintWriter out) {
if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {
startTime = null;
@@ -768,7 +773,7 @@
JSONArray line_list = new JSONArray();
List<Map<String, Object>> list = commonOrderCountService.getTrackAccuracyRate(dateType, year, startTime,
- endTime,sourceType);
+ endTime, sourceType);
JSONObject innerList = new JSONObject();
innerList.put("name", "鎬昏");
--
Gitblit v1.8.0