From 2b867f17790b6eeecc6a162187844e948aa75cf0 Mon Sep 17 00:00:00 2001 From: hupeng Date: Wed, 5 Sep 2018 20:15:34 +0800 Subject: [PATCH] =?UTF-8?q?[A=E7=AB=AF][=E6=96=B0=E5=A2=9E]:=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E5=88=86=E8=B4=A6=E6=8E=A5=E5=8F=97=E6=96=B9=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxProfitSharingReceiverController.java | 85 +++++++++++++++++++ .../WxProfitSharingReceiverService.java | 5 +- .../WxProfitSharingReceiverServiceImpl.java | 30 +++---- 3 files changed, 102 insertions(+), 18 deletions(-) create mode 100644 mallinkAdmin/src/main/java/com/simple/controller/WxProfitSharingReceiverController.java diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxProfitSharingReceiverController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxProfitSharingReceiverController.java new file mode 100644 index 000000000..8c174abea --- /dev/null +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxProfitSharingReceiverController.java @@ -0,0 +1,85 @@ +package com.simple.controller; + +import com.github.pagehelper.PageInfo; +import com.simple.common.ErrorCode; +import com.simple.common.Result; +import com.simple.common.ResultData; +import com.simple.domain.po.WxMerchant; +import com.simple.domain.po.WxProfitSharingReceiver; +import com.simple.service.WxMerchantService; +import com.simple.service.WxProfitSharingReceiverService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("wxProfitSharingReceiver") +public class WxProfitSharingReceiverController extends BaseController { + @Autowired + private WxProfitSharingReceiverService wxProfitSharingReceiverService; + @Autowired + private WxMerchantService wxMerchantService; + + private Logger logger = Logger.getLogger(WxProfitSharingReceiverController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxProfitSharingReceiver receiver, Integer pageNum, Integer pageSize) { + if (null == receiver) receiver = new WxProfitSharingReceiver(); + final PageInfo page = wxProfitSharingReceiverService.listAsPage(receiver, pageNum, pageSize); + return new ResultData(page); + } + + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxProfitSharingReceiver receiver) { + + if (receiver == null) + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + if (receiver.getMerchantId() == null) + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); + if (receiver.getReceiverType() == null) + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); + if (receiver.getReceiverComments() == null) + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); + if (receiver.getReceiverAccount() == null) + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); + + WxMerchant merchant = wxMerchantService.getById(receiver.getMerchantId()); + if (merchant == null) + return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); + + return wxProfitSharingReceiverService.addReceiver(merchant, receiver); + } + + + @ApiOperation("根据id删除接口") + @GetMapping("del") + public ResultData delete(@RequestBody WxProfitSharingReceiver receiver) { + if (receiver == null) + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + if (receiver.getMerchantId() == null) + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); + if (receiver.getReceiverType() == null) + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); + if (receiver.getReceiverAccount() == null) + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); + + WxMerchant merchant = wxMerchantService.getById(receiver.getMerchantId()); + if (merchant == null) + return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); + + return wxProfitSharingReceiverService.delReceiver(merchant, receiver); + } + + +} diff --git a/mallinkService/src/main/java/com/simple/service/WxProfitSharingReceiverService.java b/mallinkService/src/main/java/com/simple/service/WxProfitSharingReceiverService.java index a2e6ad555..cdad0e6ee 100644 --- a/mallinkService/src/main/java/com/simple/service/WxProfitSharingReceiverService.java +++ b/mallinkService/src/main/java/com/simple/service/WxProfitSharingReceiverService.java @@ -41,10 +41,9 @@ public interface WxProfitSharingReceiverService { void deleteById(Long id); + ResultData addReceiver(WxMerchant merchant, WxProfitSharingReceiver receiver); - ResultData addReceiver(WxMerchant merchant); - - ResultData delReceiver(WxMerchant merchant); + ResultData delReceiver(WxMerchant merchant, WxProfitSharingReceiver receiver); } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxProfitSharingReceiverServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxProfitSharingReceiverServiceImpl.java index 38959562f..861694576 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxProfitSharingReceiverServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxProfitSharingReceiverServiceImpl.java @@ -83,7 +83,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv @Override - public ResultData addReceiver(WxMerchant merchant) { + public ResultData addReceiver(WxMerchant merchant, WxProfitSharingReceiver receiver) { WxAppinfo appInfo = new WxAppinfo(); appInfo.setTenantId(merchant.getTenantId()); @@ -92,16 +92,17 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv appInfo = wxAppinfoMapper.findList(appInfo).get(0); WxPayAccount payAccount = wxPayAccountMapper.selectByPrimaryKey(appInfo.getPayId()); - WxProfitSharingReceiver receiver = new WxProfitSharingReceiver(); receiver.setMerchantId(merchant.getId()); receiver.setSharingType(EnumProfitSharingType.PROFIT_SHARING_TYPE_WECHAT.getCode()); receiver.setId(IdWorker.get().nextId()); receiver.setCreateTime(new Date()); receiver.setUpdateTime(new Date()); - //receiver.setReceiverAccount(merchant.getReceiverAccount().toString()); - receiver.setReceiverComments(merchant.getName()); - receiver.setReceiverType(EnumProfitSharingReceiverType.PROFIT_SHARING_RECEIVER_MERCHANT_ID.getCode()); - receiver.setTrueName(merchant.getName()); + + //passed from uplevel + //receiver.setReceiverAccount(receiverParam.getReceiverAccount()); + //receiver.setReceiverComments(receiverParam.getReceiverComments()); + //receiver.setReceiverType(receiverParam.getReceiverType()); + //receiver.setTrueName(receiverParam.getTrueName()); //添加分账账户 WxProfitSharingReceiverP wxProfitSharingReceiverP = new WxProfitSharingReceiverP(); @@ -113,9 +114,9 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv JSONObject receiverJSON = new JSONObject(); - receiverJSON.put("type",EnumProfitSharingReceiverType.PROFIT_SHARING_RECEIVER_MERCHANT_ID.getMessage()); - //receiverJSON.put("account",merchant.getReceiverAccount()); - receiverJSON.put("name",merchant.getName()); + receiverJSON.put("type",EnumProfitSharingReceiverType.getEnum(receiver.getReceiverType()).getMessage()); + receiverJSON.put("account",receiver.getReceiverAccount()); + receiverJSON.put("name",receiver.getTrueName()); wxProfitSharingReceiverP.setReceiver(receiverJSON.toJSONString()); String response; @@ -145,7 +146,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv } @Override - public ResultData delReceiver(WxMerchant merchant) { + public ResultData delReceiver(WxMerchant merchant, WxProfitSharingReceiver receiver) { WxAppinfo appInfo = new WxAppinfo(); appInfo.setTenantId(merchant.getTenantId()); appInfo.setType(EnumAppType.C.getCode()); @@ -153,11 +154,10 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv appInfo = wxAppinfoMapper.findList(appInfo).get(0); WxPayAccount payAccount = wxPayAccountMapper.selectByPrimaryKey(appInfo.getPayId()); - WxProfitSharingReceiver receiver = new WxProfitSharingReceiver(); receiver.setMerchantId(merchant.getId()); receiver.setSharingType(EnumProfitSharingType.PROFIT_SHARING_TYPE_WECHAT.getCode()); - //receiver.setReceiverAccount(merchant.getReceiverAccount().toString()); - receiver.setReceiverType(EnumProfitSharingReceiverType.PROFIT_SHARING_RECEIVER_MERCHANT_ID.getCode()); + //receiver.setReceiverAccount(receiverParam.getReceiverAccount()); + //receiver.setReceiverType(receiverParam.getReceiverType()); receiver = wxProfitSharingReceiverMapper.selectOne(receiver); @@ -174,8 +174,8 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv JSONObject receiverJSON = new JSONObject(); - receiverJSON.put("type",EnumProfitSharingReceiverType.PROFIT_SHARING_RECEIVER_MERCHANT_ID.getMessage()); - //receiverJSON.put("account",merchant.getReceiverAccount()); + receiverJSON.put("type",EnumProfitSharingReceiverType.getEnum(receiver.getReceiverType()).getMessage()); + receiverJSON.put("account",receiver.getReceiverAccount()); wxProfitSharingReceiverP.setReceiver(receiverJSON.toJSONString()); String response;