Merge remote-tracking branch 'origin/master'

doum

9 小时以前 80fd41ea0dc602ac3ca33778f17fce5bc2e817b1

 server/dmmall_web/src/main/java/com/doumee/api/web/ApiController.java

@@ -10,6 +10,7 @@
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.dao.web.response.goods.CartGoodsResponse;
import com.doumee.service.business.*;
import com.doumee.service.business.impl.MemberCouponServiceImpl;
import com.doumee.service.system.SystemDictDataService;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils;
@@ -56,6 +57,18 @@
    public GoodsorderService goodsorderService;

    @Autowired
    public ShopService shopService;

    @Autowired
    public WithdrawRecordService withdrawRecordService;

    @Autowired
    public MemberBankService memberBankService;

    @Autowired
    public MemberCouponServiceImpl memberCouponServiceImpl;

    @Autowired
    public GoodsorderDetailService goodsorderDetailService;

    @Autowired
@@ -74,8 +87,6 @@
    @Autowired
    public ArticleService articleService;

    @Autowired
    public ShopService shopService;

    @Autowired
    public ShopNewsService shopNewsService;
@@ -154,4 +165,10 @@
        return obj != null ? (Integer) obj : null;
    }

    protected Integer getShopId() {
        Object obj = this.getRequest().getAttribute(JwtTokenUtil.ShopId_Name);
        return obj != null ? (Integer) obj : null;
    }


}