master
wangning 7 years ago
parent 48e5624cb2
commit 997867d224

@ -246,7 +246,7 @@ public class RetailAppServiceImp implements RetailAppService {
JSONObject res = new JSONObject(); JSONObject res = new JSONObject();
res.put("url", url); res.put("url", url);
res.put("qrcode", QRCodeUtils.qrcodeImageCode(url, 250, false)); res.put("qrcode", QRCodeUtils.qrcodeImageCode(url, 250, false));
res.put("qrcode_board", merchantInfoProvider.getQrCodeBoard(client, config)); res.put("qrcode_board", merchantInfoProvider.getQrCodeBoard(client, config,clientAccountMapper.findById(device.getString("account_id")),"APP"));
return res; return res;
} }

@ -2720,17 +2720,15 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
} }
int open_status = client.getIntValue("open_status"); int open_status = client.getIntValue("open_status");
AuditModify auditModify = new AuditModify(manager, clientMoniker, 5, manager.getString("manager_id"), new Date()); AuditModify auditModify = new AuditModify(manager, clientMoniker, client.getInteger("approve_result"), manager.getString("manager_id"), new Date());
if (open_status == 1) { if (open_status == 1) {
auditModify.setOpen_status(null); auditModify.setOpen_status(null);
} else { } else {
auditModify.setOpen_status(-1); auditModify.setOpen_status(-1);
} }
if(client.getInteger("approve_result")==null || client.getIntValue("approve_result")==4){ if(client.getInteger("approve_result")==null || client.getIntValue("approve_result")==4){
client.put("approve_result", 5); auditModify.setApprove_result(5);
} }
client.put("approver", manager.getString("manager_id"));
client.put("approve_time", new Date());
if (refuse_remark != null && !refuse_remark.isEmpty()) { if (refuse_remark != null && !refuse_remark.isEmpty()) {
auditModify.setRefuse_remark(refuse_remark); auditModify.setRefuse_remark(refuse_remark);
} }

@ -61,5 +61,9 @@ public class AuditModify extends ClientModify {
public void setRefuse_remark(String refuse_remark) { public void setRefuse_remark(String refuse_remark) {
this.refuse_remark = refuse_remark; this.refuse_remark = refuse_remark;
} }
public void setApprove_result(Integer approve_result) {
this.approve_result = approve_result;
}
} }

Loading…
Cancel
Save