|
|
@@ -4,11 +4,12 @@ import com.poteviohealth.cgp.common.controller.BaseWebController;
|
|
|
import com.poteviohealth.cgp.common.facade.log.OperateType;
|
|
|
import com.poteviohealth.cgp.common.facade.log.OperationLog;
|
|
|
import com.poteviohealth.cgp.common.model.VaultsResponse;
|
|
|
-import com.poteviohealth.ym.ipos.model.merchant.dto.ImageDto;
|
|
|
+import com.poteviohealth.ym.ipos.model.merchant.back.UserSearchBack;
|
|
|
import com.poteviohealth.ym.ipos.model.merchant.dto.SearchDto;
|
|
|
import com.poteviohealth.ym.ipos.model.merchant.dto.UserDto;
|
|
|
-import com.poteviohealth.ym.ipos.model.merchant.back.UserSearchBack;
|
|
|
+import com.poteviohealth.ym.ipos.model.payment.dto.BindDto;
|
|
|
import com.poteviohealth.ym.ipos.service.IMerchantService;
|
|
|
+import com.poteviohealth.ym.ipos.service.IPaymentService;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
|
@@ -29,6 +30,8 @@ public class MerchantController extends BaseWebController {
|
|
|
|
|
|
@Resource
|
|
|
private IMerchantService merchantService;
|
|
|
+ @Resource
|
|
|
+ private IPaymentService paymentService;
|
|
|
|
|
|
@PostMapping("/createOpen")
|
|
|
@ApiOperation(value = "商户新增/修改开户入驻")
|
|
|
@@ -43,4 +46,17 @@ public class MerchantController extends BaseWebController {
|
|
|
public VaultsResponse<UserSearchBack> merchantQuery(@RequestBody SearchDto dto) {
|
|
|
return merchantService.merchantQuery(dto.getPhone(),dto.getMerchantId());
|
|
|
}
|
|
|
+
|
|
|
+ @PostMapping("/bindPos")
|
|
|
+ @ApiOperation(value = "绑定终端")
|
|
|
+ @OperationLog(type = OperateType.SELECT, description ="绑定终端")
|
|
|
+ public VaultsResponse bindPos() {
|
|
|
+ BindDto bd = new BindDto();
|
|
|
+ bd.setAppId("wx31cd5ff619b017f7");
|
|
|
+ bd.setPosId("ZKY");
|
|
|
+ bd.setStoreId("19");
|
|
|
+ bd.setName("(ZKY)北京无向图");
|
|
|
+ return paymentService.bindPos(bd);
|
|
|
+ }
|
|
|
+
|
|
|
}
|
qin