From 88b54772dbcf5ecab1e2316e4e4626ac901b8908 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 22 一月 2019 15:58:24 +0800
Subject: [PATCH] 邀请码添加返回状态
---
fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java | 3 +--
fanli/src/main/java/com/yeshi/fanli/controller/admin/TaoBaoGoodsBriefAdminController.java | 16 +++++++---------
fanli/src/main/java/com/yeshi/fanli/controller/admin/QualityFactoryAdminController.java | 9 ++-------
3 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/QualityFactoryAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/QualityFactoryAdminController.java
index 9d0e825..35250c2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/QualityFactoryAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/QualityFactoryAdminController.java
@@ -11,8 +11,6 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import net.sf.json.JSONObject;
-
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.JsonUtil;
@@ -27,7 +25,6 @@
import com.yeshi.fanli.entity.common.AdminUser;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.exception.QualityFactoryException;
-import com.yeshi.fanli.service.AdminUserService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
import com.yeshi.fanli.service.inter.lable.LabelGoodsService;
import com.yeshi.fanli.service.inter.lable.LabelService;
@@ -41,6 +38,8 @@
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.vo.quality.QualityFactoryVO;
+
+import net.sf.json.JSONObject;
@Controller
@RequestMapping("admin/new/api/v1/qualityFactory")
@@ -58,10 +57,6 @@
private TaoBaoGoodsBriefService taoBaoGoodsBriefService;
@Resource
private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;
-
- @Resource
- private AdminUserService adminUserService;
-
public static final int SALES_ASC = 1;
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/TaoBaoGoodsBriefAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/TaoBaoGoodsBriefAdminController.java
index 38cf269..74b2f84 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/TaoBaoGoodsBriefAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/TaoBaoGoodsBriefAdminController.java
@@ -467,11 +467,11 @@
}
}
- // TODO /* 鍒稿悗浠�--璁＄畻 */
+ /* 鍒稿悗浠�--璁＄畻 */
BigDecimal couponPrice = TaoBaoUtil.getAfterUseCouplePrice(taoBaoGoodsBrief);
map.put("couponPrice", couponPrice);
- // TODO /* 棰勮鏀剁泭锛� 鍏徃銆佺敤鎴� */
+ /* 棰勮鏀剁泭锛� 鍏徃銆佺敤鎴� */
BigDecimal tkRate = taoBaoGoodsBrief.getTkRate();
BigDecimal zkPrice = taoBaoGoodsBrief.getZkPrice();
BigDecimal profit = MoneyBigDecimalUtil.mul(tkRate, zkPrice);
@@ -696,7 +696,7 @@
BigDecimal couponPrice = TaoBaoUtil.getAfterUseCouplePrice(taoBaoGoodsBrief);
map.put("couponPrice", couponPrice);
- // TODO /* 棰勮鏀剁泭锛� 鍏徃銆佺敤鎴� */
+ /* 棰勮鏀剁泭锛� 鍏徃銆佺敤鎴� */
BigDecimal zkPrice = taoBaoGoodsBrief.getZkPrice();
BigDecimal profit = MoneyBigDecimalUtil.mul(rate, zkPrice);
// 璁＄畻缁撴灉
@@ -752,7 +752,6 @@
}
} catch (Exception e) {
- // TODO Auto-generated catch block
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏌ヨ寮傚父"));
e.printStackTrace();
}
@@ -800,7 +799,6 @@
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
- // TODO Auto-generated catch block
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏌ヨ寮傚父"));
e.printStackTrace();
}
@@ -904,11 +902,11 @@
// 鏉ユ簮 0 鏃� 1娣樺疂 2 浜笢
map.put("goodsSource", 1);
- // TODO /* 鍒稿悗浠�--璁＄畻 */
+ /* 鍒稿悗浠�--璁＄畻 */
BigDecimal couponPrice = TaoBaoUtil.getAfterUseCouplePrice(taoBaoGoodsBrief);
map.put("couponPrice", couponPrice);
- // TODO /* 棰勮鏀剁泭锛� 鍏徃銆佺敤鎴� */
+ /* 棰勮鏀剁泭锛� 鍏徃銆佺敤鎴� */
BigDecimal tkRate = taoBaoGoodsBrief.getTkRate();
BigDecimal zkPrice = taoBaoGoodsBrief.getZkPrice();
BigDecimal profit = MoneyBigDecimalUtil.mul(tkRate, zkPrice);
@@ -1020,11 +1018,11 @@
// 鏉ユ簮 0 鏃� 1娣樺疂 2 浜笢
map.put("goodsSource", 1);
- // TODO /* 鍒稿悗浠�--璁＄畻 */
+ /* 鍒稿悗浠�--璁＄畻 */
BigDecimal couponPrice = TaoBaoUtil.getAfterUseCouplePrice(taoBaoGoodsBrief);
map.put("couponPrice", couponPrice);
- // TODO /* 棰勮鏀剁泭锛� 鍏徃銆佺敤鎴� */
+ /* 棰勮鏀剁泭锛� 鍏徃銆佺敤鎴� */
BigDecimal tkRate = taoBaoGoodsBrief.getTkRate();
BigDecimal zkPrice = taoBaoGoodsBrief.getZkPrice();
BigDecimal profit = MoneyBigDecimalUtil.mul(tkRate, zkPrice);
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java
index ab3f298..8a3fc62 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java
@@ -374,10 +374,9 @@
try {
ThreeSale threeSale = threeSaleSerivce.getMyBoss(uid);
if (threeSale == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏃犱笂绾ч個璇蜂汉"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(2, "鏃犱笂绾ч個璇蜂汉"));
return;
}
-
UserInfo boss = threeSale.getBoss();
if (boss == null) {
--
Gitblit v1.8.0