|
|
|
@@ -53,7 +53,7 @@ public class WxMerchantController extends BaseController { |
|
|
|
public ResultData listVo(@ModelAttribute WxMerchant wxMerchant, Integer pageNum, Integer pageSize) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); |
|
|
|
if (null == wxMerchant) wxMerchant = new WxMerchant(); |
|
|
|
wxMerchant.setTenantId(getTenantId()); |
|
|
|
wxMerchant.updateTenantInfo(getTenantInfo()); |
|
|
|
wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); |
|
|
|
final PageInfo<WxMerchant> page = wxMerchantService.listVoAsPage(wxMerchant, pageNum, pageSize); |
|
|
|
return new ResultData(page); |
|
|
|
@@ -70,7 +70,7 @@ public class WxMerchantController extends BaseController { |
|
|
|
public ResultData list(@ModelAttribute WxMerchant wxMerchant, Integer pageNum, Integer pageSize) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); |
|
|
|
if (null == wxMerchant) wxMerchant = new WxMerchant(); |
|
|
|
wxMerchant.setTenantId(getTenantId()); |
|
|
|
wxMerchant.updateTenantInfo(getTenantInfo()); |
|
|
|
wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); |
|
|
|
final PageInfo<WxMerchant> page = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); |
|
|
|
return new ResultData(page); |
|
|
|
@@ -83,7 +83,7 @@ public class WxMerchantController extends BaseController { |
|
|
|
public ResultData etcpList(@ModelAttribute WxMerchant wxMerchant) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxMerchantController::etcpList"); |
|
|
|
if (null == wxMerchant) wxMerchant = new WxMerchant(); |
|
|
|
wxMerchant.setTenantId(getTenantId()); |
|
|
|
wxMerchant.updateTenantInfo(getTenantInfo()); |
|
|
|
final List<WxMerchant> merchantList = wxMerchantService.etcpList(wxMerchant); |
|
|
|
return new ResultData(merchantList); |
|
|
|
} |
|
|
|
@@ -123,7 +123,7 @@ public class WxMerchantController extends BaseController { |
|
|
|
@SystemControllerLog(description = "商户-新增") |
|
|
|
public ResultData addMerchant(@RequestBody WxMerchant wxMerchant) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxMerchantController::addMerchant"); |
|
|
|
wxMerchant.setTenantId(getTenantId()); |
|
|
|
wxMerchant.updateTenantInfo(getTenantInfo()); |
|
|
|
|
|
|
|
ResultData resultData = wxMerchantService.addMerchant(wxMerchant, getUserId()); |
|
|
|
|
|
|
|
@@ -148,7 +148,7 @@ public class WxMerchantController extends BaseController { |
|
|
|
@SystemControllerLog(description = "商户-更新") |
|
|
|
public ResultData updateMerchant(@RequestBody WxMerchant wxMerchant) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchant"); |
|
|
|
wxMerchant.setTenantId(getTenantId()); |
|
|
|
wxMerchant.updateTenantInfo(getTenantInfo()); |
|
|
|
return wxMerchantService.updateMerchant(wxMerchant); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -157,7 +157,7 @@ public class WxMerchantController extends BaseController { |
|
|
|
@SystemControllerLog(description = "商户-更新账户") |
|
|
|
public ResultData updateMerchantAccount(@RequestBody WxMerchant wxMerchant) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchantAccount"); |
|
|
|
wxMerchant.setTenantId(getTenantId()); |
|
|
|
wxMerchant.updateTenantInfo(getTenantInfo()); |
|
|
|
return wxMerchantService.updateMerchantAccount(wxMerchant); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -166,7 +166,7 @@ public class WxMerchantController extends BaseController { |
|
|
|
@SystemControllerLog(description = "商户-更新管理员") |
|
|
|
public ResultData updateMerchantAdmin(@RequestBody WxMerchant wxMerchant) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchantAdmin"); |
|
|
|
wxMerchant.setTenantId(getTenantId()); |
|
|
|
wxMerchant.updateTenantInfo(getTenantInfo()); |
|
|
|
return wxMerchantService.updateMerchantAdmin(wxMerchant); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -175,7 +175,7 @@ public class WxMerchantController extends BaseController { |
|
|
|
@SystemControllerLog(description = "商户-更新法人") |
|
|
|
public ResultData updateMerchantCopr(@RequestBody WxMerchant wxMerchant) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchantCorp"); |
|
|
|
wxMerchant.setTenantId(getTenantId()); |
|
|
|
wxMerchant.updateTenantInfo(getTenantInfo()); |
|
|
|
return wxMerchantService.updateMerchantCorp(wxMerchant); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -184,7 +184,7 @@ public class WxMerchantController extends BaseController { |
|
|
|
@SystemControllerLog(description = "商户-更新税务") |
|
|
|
public ResultData updateMerchantTax(@RequestBody WxMerchant wxMerchant) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchantTax"); |
|
|
|
wxMerchant.setTenantId(getTenantId()); |
|
|
|
wxMerchant.updateTenantInfo(getTenantInfo()); |
|
|
|
return wxMerchantService.updateMerchantTax(wxMerchant); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -193,7 +193,7 @@ public class WxMerchantController extends BaseController { |
|
|
|
@SystemControllerLog(description = "商户-更新会员等级权益") |
|
|
|
public ResultData updateMerchantLevel(@RequestBody WxMerchant wxMerchant) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchantLevel"); |
|
|
|
wxMerchant.setTenantId(getTenantId()); |
|
|
|
wxMerchant.updateTenantInfo(getTenantInfo()); |
|
|
|
return wxMerchantService.updateMerchantLevel(wxMerchant); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -230,7 +230,7 @@ public class WxMerchantController extends BaseController { |
|
|
|
@SystemControllerLog(description = "商户-置顶") |
|
|
|
public ResultData top(@RequestBody WxMerchant wxMerchant) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxMerchantController::top"); |
|
|
|
wxMerchant.setTenantId(getTenantId()); |
|
|
|
wxMerchant.updateTenantInfo(getTenantInfo()); |
|
|
|
return wxMerchantService.top(wxMerchant); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -239,7 +239,7 @@ public class WxMerchantController extends BaseController { |
|
|
|
@SystemControllerLog(description = "商户-更新收款账户状态") |
|
|
|
public ResultData useAccount(@RequestBody WxProfitSharingReceiver wxProfitSharingReceiver) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxMerchantController::useAccount"); |
|
|
|
wxProfitSharingReceiver.setTenantId(getTenantId()); |
|
|
|
wxProfitSharingReceiver.updateTenantInfo(getTenantInfo()); |
|
|
|
return wxMerchantService.useAccount(wxProfitSharingReceiver); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -248,7 +248,7 @@ public class WxMerchantController extends BaseController { |
|
|
|
@SystemControllerLog(description = "商户-查看是否存在商户名称相同记录") |
|
|
|
public ResultData hasMerchant(@ModelAttribute WxMerchant wxMerchant) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxMerchantController::hasMerchant"); |
|
|
|
wxMerchant.setTenantId(getTenantId()); |
|
|
|
wxMerchant.updateTenantInfo(getTenantInfo()); |
|
|
|
boolean has = wxMerchantService.hasMerchant(wxMerchant); |
|
|
|
return new ResultData(has); |
|
|
|
} |
|
|
|
@@ -262,7 +262,7 @@ public class WxMerchantController extends BaseController { |
|
|
|
public ResultData userTradeList(@ModelAttribute WxMerchant wxMerchant, Integer pageNum, Integer pageSize) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); |
|
|
|
if (null == wxMerchant) wxMerchant = new WxMerchant(); |
|
|
|
wxMerchant.setTenantId(getTenantId()); |
|
|
|
wxMerchant.updateTenantInfo(getTenantInfo()); |
|
|
|
wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); |
|
|
|
final PageInfo<WxMerchantTradeVo> page = wxMerchantService.userTradeList(wxMerchant, pageNum, pageSize); |
|
|
|
return new ResultData(page); |
|
|
|
@@ -277,7 +277,7 @@ public class WxMerchantController extends BaseController { |
|
|
|
public ResultData userTradeDetailList(@ModelAttribute WxMerchant wxMerchant, Integer pageNum, Integer pageSize) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); |
|
|
|
if (null == wxMerchant) wxMerchant = new WxMerchant(); |
|
|
|
wxMerchant.setTenantId(getTenantId()); |
|
|
|
wxMerchant.updateTenantInfo(getTenantInfo()); |
|
|
|
final PageInfo<WxMerchantTradeDetailVo> page = wxMerchantService.userTradeDetailList(wxMerchant, pageNum, pageSize); |
|
|
|
return new ResultData(page); |
|
|
|
} |
|
|
|
@@ -288,7 +288,7 @@ public class WxMerchantController extends BaseController { |
|
|
|
public void exportUserTradeList(@ModelAttribute WxMerchant wxMerchant,HttpServletRequest request, HttpServletResponse response) throws Exception{ |
|
|
|
logger.debug("[" + getIpAddr() + "] WxBusinessController::exportUserTradeDetailList"); |
|
|
|
if (null == wxMerchant) wxMerchant = new WxMerchant(); |
|
|
|
wxMerchant.setTenantId(getTenantId()); |
|
|
|
wxMerchant.updateTenantInfo(getTenantInfo()); |
|
|
|
wxMerchantService.exportUserTradeList(wxMerchant, request,response); |
|
|
|
} |
|
|
|
|
|
|
|
|