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; 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); 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) {
