anpeng/apzl_leasing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改测试bug

Browse Source
This commit is contained in:
tangfutang 2019-12-26 10:32:33 +08:00
parent 2be3323711
commit 4fc08e2328
4 changed files with 71 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src_sql/投产SQL/v20191228/tft_20191228.sql
View File

@ -270,7 +270,7 @@ Insert Into Code_Library (codeno,itemno,itemname,bankno,sortno,isinuse,itemdescr
Insert Into Code_Library (codeno,itemno,itemname,bankno,sortno,isinuse,itemdescribe,itemattribute,relativecode,attribute1,attribute2,attribute3,attribute4,attribute5,attribute6,attribute7,attribute8,inputuser,inputorg,inputtime,updateuser,updatetime,remark,helptext) Values ('charge_channel','wysk','网银回款','','0030','1','','','','','','','','','','','','SYS_Designer',null,'2019/12/16 10:00:51','SYS_Designer','2019/12/16 11:56:51','','');
-- 取招商银行的实际付日期
ALTER TABLE lc_fund_income_callback_detail_temp ADD COLUMN isPaymentDate VARCHAR(5) NULL COMMENT '是否查询交易日(01已查询)' AFTER contract_i, ADD COLUMN PaymentDate VARCHAR(32) NULL COMMENT '支付时间' AFTER isPaymentDate;
ALTER TABLE lc_fund_income_callback_detail_temp ADD COLUMN isPaymentDate VARCHAR(5) NULL COMMENT '是否查询交易日(01已查询)' AFTER contract_id, ADD COLUMN PaymentDate VARCHAR(32) NULL COMMENT '支付时间' AFTER isPaymentDate;
-- 将历史数据改为已查询
update lc_fund_income_callback_detail_temp set isPaymentDate='01';

2
src_tenwa/com/tenwa/customer/controller/group/CheckMessageSend.java
View File

@ -46,7 +46,7 @@ public class CheckMessageSend {
}
//校验扣款手续费维护日期
//校验发送短信设置经销商是否重复
public String checkMessageSend(JBOTransaction tx) throws Exception{
Conn conn = new Conn(tx);
String sql = "select id from SEND_TEXT_MMESSAGE where channel_no=? and msg_type=?";

29
src_tenwa/com/tenwa/customer/controller/group/SelectSendMessageType.java Normal file
View File

@ -0,0 +1,29 @@
package com.tenwa.customer.controller.group;
import java.util.List;
import java.util.Map;
import jbo.ui.system.CODE_LIBRARY;
import com.amarsoft.are.jbo.BizObject;
import com.amarsoft.are.jbo.BizObjectManager;
import com.amarsoft.are.jbo.JBOFactory;
import com.tenwa.comm.util.jboutil.DataOperatorUtil;
public class SelectSendMessageType {
public static String selectSendMessage(String messageType)throws Exception{
StringBuffer itemname = new StringBuffer();
BizObjectManager clManage = JBOFactory.getBizObjectManager(CODE_LIBRARY.CLASS_NAME);
messageType = messageType.replace(",", "','");
List<BizObject> itemnameList = clManage.createQuery("codeno='MsgType' AND itemno IN ('"+messageType+"')").getResultList(false);
for (int i = 0 ;i<itemnameList.size();i++) {
if(i == (itemnameList.size()-1)){
itemname.append(itemnameList.get(i).getAttribute("itemname"));
}else{
itemname.append(itemnameList.get(i).getAttribute("itemname")).append(",");
}
}
return itemname.toString();
}
}

46
src_tenwa/com/tenwa/lease/app/quartzmession/AutoBuckle.java
View File

@ -1,7 +1,11 @@
package com.tenwa.lease.app.quartzmession;
import java.util.ArrayList;
import java.util.List;
import jbo.app.tenwa.calc.LC_RENT_INCOME_TEMP;
import jbo.com.tenwa.lease.comm.LC_OCCUPY_RENT_LIST;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
@ -29,14 +33,44 @@ public class AutoBuckle implements Job {
//
tx = JBOFactory.createJBOTransaction();
//and (O.rent<>'' or O.rent<>'0' or O.rent<>'0.0')
List<BizObject> bos = JBOFactory.getBizObjectManager("jbo.com.tenwa.lease.comm.VI_LC_AUDIT_RENT_PLAN", tx).createQuery("O.COLLECT_STATUS IN ('未收款', '部分收款','代偿') and O.PLAN_DATE <= '" + plan_date + "' and ( O.BATCH_STATUS<>'process' or o.BATCH_STATUS IS NULL ) ").getResultList(true);
List<BizObject> bos = JBOFactory.getBizObjectManager("jbo.com.tenwa.lease.comm.VI_LC_AUDIT_RENT_PLAN", tx).createQuery("O.COLLECT_STATUS IN ('未收款', '部分收款','代偿') and O.PLAN_DATE <= '" + plan_date + "' and ( O.BATCH_STATUS<>'process' or o.BATCH_STATUS IS NULL ) and O.distributor_id not in (select dealers_number from DEDUCTIONS_WAY where Whether_to_enable='Y') ").getResultList(true);
StringBuffer ids = new StringBuffer();
if(bos.size()>0){
for(BizObject bo : bos){
ids.append(bo.getAttribute("id").getString() + "@");
List<BizObject> bol = JBOFactory.createBizObjectQuery(LC_OCCUPY_RENT_LIST.CLASS_NAME,"FLOW_NAME in ('网银收款','微信银联收款','微信支付收款')").getResultList(false);
//获取租金占用表里的数据有哪些是网银收款占用的
List<String> planIDs = new ArrayList<String>();
if(bol.size()>0){
for(int i=0;i<bol.size();i++){
String flowName = bol.get(i).getAttribute("FLOW_NAME").toString();
if("网银收款".equals(flowName)){
//暂时没有让更新
/*String flowunid = bol.get(i).getAttribute("FLOWUNID").toString();
List<BizObject> bof = JBOFactory.createBizObjectQuery(LC_RENT_INCOME_TEMP.CLASS_NAME,"FLOWUNID=:flowunid").setParameter("flowunid", flowunid).getResultList(false);
if(bof.size()>0){
for(int j=0;j<bof.size();j++){
String planID = bof.get(j).getAttribute("PLAN_ID").toString();
planIDs.add(planID);
}
}*/
}else if ("微信银联收款".equals(flowName) || "微信支付收款".equals(flowName)){
planIDs.add(bol.get(i).getAttribute("PLAN_ID").toString());
}
}
}
StringBuffer ids = new StringBuffer();
if(bos.size()>0){
a:for(BizObject bo : bos){
String pid = bo.getAttribute("id").getString();
if(planIDs.size()>0){
for(int i=0;i<planIDs.size();i++){
if(pid.equals(planIDs.get(i))){
continue a;
}
}
}
ids.append(pid+"@");
}
System.out.println("本次扣款的plan_id:"+ids.toString());
ca.setId(ids.toString().substring(0, ids.toString().length()-1));
Configure CurConfig = Configure.getInstance();
ca.setFileSavePath(CurConfig.getConfigure("InterfaceFileSavePath"));