sign channel

master
wangning 7 years ago
parent ff32f2cad2
commit 55bad532b4

@ -345,6 +345,6 @@ public class RetailAppController {
@RequestMapping(value = "/file/agree/confirm", method = RequestMethod.POST) @RequestMapping(value = "/file/agree/confirm", method = RequestMethod.POST)
public void confirmSourceAgreeFile(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device) { public void confirmSourceAgreeFile(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device) {
clientContractService.confirmSourceAgreement(device.getIntValue("client_id"),device.getString("account_id")); clientContractService.confirmSourceAgreement(device.getIntValue("client_id"),device.getString("account_id"),"App");
} }
} }

@ -20,7 +20,6 @@ import au.com.royalpay.payment.tools.env.SysConfigManager;
import au.com.royalpay.payment.tools.http.HttpUtils; import au.com.royalpay.payment.tools.http.HttpUtils;
import au.com.royalpay.payment.tools.merchants.beans.QRCodeConfig; import au.com.royalpay.payment.tools.merchants.beans.QRCodeConfig;
import au.com.royalpay.payment.tools.permission.enums.ManagerRole; import au.com.royalpay.payment.tools.permission.enums.ManagerRole;
import au.com.royalpay.payment.tools.permission.enums.PartnerRole;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
@ -532,6 +531,6 @@ public class PartnerManageController {
@PartnerMapping(value = "/agree/confirm", method = RequestMethod.POST) @PartnerMapping(value = "/agree/confirm", method = RequestMethod.POST)
public void confirmSourceAgreeFile(@ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject account) { public void confirmSourceAgreeFile(@ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject account) {
clientContractService.confirmSourceAgreement(account.getIntValue("client_id"),account.getString("account_id")); clientContractService.confirmSourceAgreement(account.getIntValue("client_id"),account.getString("account_id"),"PC");
} }
} }

@ -6,7 +6,7 @@ public interface ClientContractService {
JSONObject getOrGenerateSourceAgreement(int client_id,String channel); JSONObject getOrGenerateSourceAgreement(int client_id,String channel);
void confirmSourceAgreement(int client_id,String account_id); void confirmSourceAgreement(int client_id,String account_id,String channel);
JSONObject getSourceAgreement(int client_id); JSONObject getSourceAgreement(int client_id);

@ -87,7 +87,7 @@ public class ClientContractServiceImpl implements ClientContractService {
@Override @Override
@Transactional @Transactional
public void confirmSourceAgreement(int client_id,String account_id) { public void confirmSourceAgreement(int client_id,String account_id,String channel) {
JSONObject client = clientManager.getClientInfo(client_id); JSONObject client = clientManager.getClientInfo(client_id);
if (client == null) { if (client == null) {
throw new NotFoundException("merchant not found"); throw new NotFoundException("merchant not found");
@ -106,6 +106,7 @@ public class ClientContractServiceImpl implements ClientContractService {
contract.put("has_sign", 1); contract.put("has_sign", 1);
contract.put("sign_account_id",account_id); contract.put("sign_account_id",account_id);
contract.put("sign_channel",channel);
contract.put("signatory",account.getString("display_name")); contract.put("signatory",account.getString("display_name"));
clientsContractMapper.update(contract); clientsContractMapper.update(contract);
Date now = new Date(); Date now = new Date();

Loading…
Cancel
Save