|
|
|
@@ -17,6 +17,9 @@ import org.springframework.web.bind.annotation.*; |
|
|
|
|
|
|
|
import java.util.List; |
|
|
|
|
|
|
|
/** |
|
|
|
* @author gongbiao |
|
|
|
*/ |
|
|
|
@RestController |
|
|
|
@RequestMapping("wxMerchant") |
|
|
|
public class WxMerchantController extends BaseController { |
|
|
|
@@ -77,8 +80,7 @@ public class WxMerchantController extends BaseController { |
|
|
|
@GetMapping("/findById") |
|
|
|
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) |
|
|
|
public ResultData findById(Long id) { |
|
|
|
WxMerchant wxMerchant = new WxMerchant(); |
|
|
|
wxMerchant = wxMerchantService.getById(id); |
|
|
|
WxMerchant wxMerchant = wxMerchantService.getById(id); |
|
|
|
if (wxMerchant != null) { |
|
|
|
WxProfitSharingReceiver receiver = wxProfitSharingReceiverService.findReceiver(wxMerchant); |
|
|
|
if (receiver != null){ |
|
|
|
|