anderx 6 lat temu
rodzic
commit
a758601220
19 zmienionych plików z 203 dodań i 65 usunięć
  1. 1 2
      src/main/java/com/goafanti/common/dao/TOrderNewMapper.java
  2. 9 2
      src/main/java/com/goafanti/common/mapper/OrganizationManagementMapper.xml
  3. 17 1
      src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml
  4. 2 2
      src/main/java/com/goafanti/common/mapper/TemporaryReceivablesMapper.xml
  5. 13 0
      src/main/java/com/goafanti/common/model/OrganizationManagement.java
  6. 16 2
      src/main/java/com/goafanti/order/bo/OrderListBo.java
  7. 7 0
      src/main/java/com/goafanti/order/bo/ReceivablesListBo.java
  8. 1 0
      src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java
  9. 0 3
      src/main/java/com/goafanti/order/controller/FundManagerOrderApiController.java
  10. 62 0
      src/main/java/com/goafanti/order/enums/ReceivablesStatus.java
  11. 0 6
      src/main/java/com/goafanti/order/service/FundManageOrderService.java
  12. 0 23
      src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java
  13. 16 4
      src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java
  14. 30 12
      src/main/java/com/goafanti/order/service/impl/OrderReceivablesServiceImpl.java
  15. 8 1
      src/main/java/com/goafanti/order/service/impl/OutsourceOrgServiceImpl.java
  16. 15 0
      src/main/java/com/goafanti/organization/bo/OrganizationListOut.java
  17. 3 5
      src/main/java/com/goafanti/organization/controller/AdminOrganizationController.java
  18. 1 1
      src/main/java/com/goafanti/organization/service/OrganizationService.java
  19. 2 1
      src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java

+ 1 - 2
src/main/java/com/goafanti/common/dao/TOrderNewMapper.java

@@ -92,9 +92,8 @@ public interface TOrderNewMapper {
 
     OrderRefundDetailBo orderRefundDetail(String id);
 
-	int updateFinance(@Param("aid")String aid, @Param("orderNo")String orderNo, @Param("newFinance")String newFinance);
+	int updateFinance(@Param("aid")String aid, @Param("orderNos")List<String> orderNos, @Param("newFinance")String newFinance);
 	int checkContractNo(String sno);
 	Map<String, Object> countTotalAndActually(OrderListBo o);
 	TOrderBillNew getLastPayment(String orderNo);
-
 }

+ 9 - 2
src/main/java/com/goafanti/common/mapper/OrganizationManagementMapper.xml

@@ -20,6 +20,7 @@
     <result column="remarks" jdbcType="VARCHAR" property="remarks" />
     <result column="status" jdbcType="VARCHAR" property="status" />
     <result column="abbreviation" jdbcType="VARCHAR" property="abbreviation" />
+    <result column="finance_id" jdbcType="VARCHAR" property="financeId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -96,7 +97,7 @@
       This element was generated on Thu Nov 30 11:09:29 CST 2017.
     -->
     id, create_id, create_time, update_time, deleted_sign, name, type, manager_id, dep_no, 
-    super_id, remarks, status,abbreviation
+    super_id, remarks, status,abbreviation,finance_id
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.OrganizationManagementExample" resultMap="BaseResultMap">
     <!--
@@ -376,6 +377,9 @@
       <if test="abbreviation != null">
         abbreviation = #{abbreviation,jdbcType=VARCHAR},
       </if>
+      <if test="financeId != null">
+        finance_id = #{financeId,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -521,9 +525,12 @@
 		a.remarks,
 		a.status,
 		a.abbreviation,
+		a.finance_id financeId,
+		c.name financeName,
 		b.name as managerName
 	from department a 
-	left join admin b on a.manager_id = b.id 
+	left join admin b on a.manager_id = b.id
+	left join admin c on a.finance_id = c.id
 	where 
 		a.id=#{id,jdbcType=VARCHAR}
 	</select>

+ 17 - 1
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1127,6 +1127,11 @@ where delete_sign != 1  and outsource=  #{o.outsource,jdbcType=INTEGER}
 	  	<bind name="b" value="o.endTime + ' 23:59:59'" />
 	  	and o.create_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
 	  	</if>
+	  	<if test="o.startFinalReceivablesTime != null and o.startFinalReceivablesTime != &quot;&quot; and o.endFinalReceivablesTime != null and o.endFinalReceivablesTime != &quot;&quot;">
+	  	<bind name="c" value="o.startFinalReceivablesTime + ' 00:00:00'" />
+	  	<bind name="d" value="o.endFinalReceivablesTime + ' 23:59:59'" />
+	  	and f.create_time between #{c,jdbcType=VARCHAR} and #{d,jdbcType=VARCHAR}
+	  	</if>
 	  	order by o.liquidation_status, o.sign_time desc
 	  	<if test="page_sql != null">
 			${page_sql}
@@ -1139,6 +1144,9 @@ where delete_sign != 1  and outsource=  #{o.outsource,jdbcType=INTEGER}
   	 left join admin a on o.salesman_id = a.id
   	 left join (select sum(transaction_amount) as amount ,order_no from t_order_bill_new
   				group by order_no ) b on b.order_no = o.order_no
+  	left join (select x1.order_no,max(create_time) create_time,max(transaction_amount)transaction_amount from 
+(select x.order_no,x.create_time,x.transaction_amount from t_order_bill_new x right join (select order_no, max(create_time) maxTime from t_order_bill_new group by order_no)y
+	on  x.order_no=y.order_no and x.create_time=y.maxTime)x1 group by x1.order_no ) f on o.order_no = f.order_no
   	 where delete_sign != 1 and outsource=  #{o.outsource,jdbcType=INTEGER}
   	 	<if test="o.processStatus == 3">
 	  	and o.process_status = #{o.processStatus,jdbcType=INTEGER}
@@ -1173,6 +1181,11 @@ where delete_sign != 1  and outsource=  #{o.outsource,jdbcType=INTEGER}
 	  	<bind name="b" value="o.endTime + ' 23:59:59'" />
 	  	and o.create_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
 	  	</if>
+	  	<if test="o.startFinalReceivablesTime != null and o.startFinalReceivablesTime != &quot;&quot; and o.endFinalReceivablesTime != null and o.endFinalReceivablesTime != &quot;&quot;">
+	  	<bind name="c" value="o.startFinalReceivablesTime + ' 00:00:00'" />
+	  	<bind name="d" value="o.endFinalReceivablesTime + ' 23:59:59'" />
+	  	and f.create_time between #{c,jdbcType=VARCHAR} and #{d,jdbcType=VARCHAR}
+	  	</if>
   </select>
   <!-- 通过订单编号获得订单的负责人(营销员) -->
   <select id="getSaleIdByOno" parameterType="java.lang.String" resultType="com.goafanti.order.bo.TOrderNewBo">
@@ -1497,7 +1510,10 @@ where super_id is null ) e on e.order_no=a.order_no
   </select>
   <update id="updateFinance" parameterType="string">
   update t_order_new set finance_id= #{newFinance,jdbcType=VARCHAR}
-	where order_no= #{orderNo,jdbcType=VARCHAR}
+	where order_no in	
+	<foreach close=")" collection="orderNos" item="orderNo" open="(" separator=",">
+	 #{orderNo}
+  	</foreach> 
 	and finance_id= #{aid,jdbcType=VARCHAR}
   </update>
   <select id="checkContractNo" resultType="java.lang.Integer">

+ 2 - 2
src/main/java/com/goafanti/common/mapper/TemporaryReceivablesMapper.xml

@@ -377,7 +377,7 @@
   </delete>
   <delete id="deleteNormalByaid">
   delete from temporary_receivables
-    where aid = #{aid} and status !=2
+    where aid = #{aid} and status &lt; 2
   </delete>
   <select id="selectByaid" resultMap="BaseResultMap">
   
@@ -542,6 +542,6 @@
 	left join user y1 on x1.buyer_id=y1.id )b on a.order_no=b.order_no where a.corporate_name=b.nickname 
 	group by a.order_no,a.corporate_name,a.amount,a.receivables_time)a where a.counts>1 )y set x.status=1 
 	where x.order_no=y.order_no and x.amount=y.amount and x.receivables_time=y.receivables_time 
-	and x.corporate_name=y.nickname and a.aid= #{aid}
+	and x.corporate_name=y.nickname and x.aid= #{aid}
   </update>
 </mapper>

+ 13 - 0
src/main/java/com/goafanti/common/model/OrganizationManagement.java

@@ -68,6 +68,11 @@ public class OrganizationManagement {
 	 * 缩写
 	 */
 	private String abbreviation;
+	
+	/**
+	 * 负责财务id
+	 */
+	private String financeId;
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_management.id
 	 * @return  the value of organization_management.id
@@ -292,4 +297,12 @@ public class OrganizationManagement {
 	public void setAbbreviation(String abbreviation) {
 		this.abbreviation = abbreviation;
 	}
+
+	public String getFinanceId() {
+		return financeId;
+	}
+
+	public void setFinanceId(String financeId) {
+		this.financeId = financeId;
+	}
 }

+ 16 - 2
src/main/java/com/goafanti/order/bo/OrderListBo.java

@@ -82,8 +82,10 @@ public class OrderListBo {
 	private String finalReceivablesTime;
 	/** 开票金额 */
 	private String invoiceAmount;
-	
-	
+	/** 结束最后收款 时间*/
+	private String endFinalReceivablesTime;
+	/** 开始最后收款 时间*/
+	private String startFinalReceivablesTime;	
 	
 	public String getFinalReceivables() {
 		return finalReceivables;
@@ -313,4 +315,16 @@ public class OrderListBo {
 	public void setOutsourceName(String outsourceName) {
 		this.outsourceName = outsourceName;
 	}
+	public String getEndFinalReceivablesTime() {
+		return endFinalReceivablesTime;
+	}
+	public void setEndFinalReceivablesTime(String endFinalReceivablesTime) {
+		this.endFinalReceivablesTime = endFinalReceivablesTime;
+	}
+	public String getStartFinalReceivablesTime() {
+		return startFinalReceivablesTime;
+	}
+	public void setStartFinalReceivablesTime(String startFinalReceivablesTime) {
+		this.startFinalReceivablesTime = startFinalReceivablesTime;
+	}
 }

+ 7 - 0
src/main/java/com/goafanti/order/bo/ReceivablesListBo.java

@@ -10,6 +10,7 @@ public class ReceivablesListBo {
 	private String settlementAmount;
 	private String depName;
 	private Integer status;
+	private Integer inptStatus;
 	private String amount;
 	private String receivablesTimes;
 	private String createTimes;
@@ -99,6 +100,12 @@ public class ReceivablesListBo {
 	public void setSettlementAmount(String settlementAmount) {
 		this.settlementAmount = settlementAmount;
 	}
+	public Integer getInptStatus() {
+		return inptStatus;
+	}
+	public void setInptStatus(Integer inptStatus) {
+		this.inptStatus = inptStatus;
+	}
 	
 	
 

+ 1 - 0
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -444,6 +444,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		orderNewService.updateFinance( orderNo, newFinance);
 		return res;
 	}
+	
 	/**
 	 * 查看订单日志
 	 */

+ 0 - 3
src/main/java/com/goafanti/order/controller/FundManagerOrderApiController.java

@@ -169,9 +169,6 @@ public class FundManagerOrderApiController extends CertifyApiController {
 		if (StringUtils.isBlank(orderNo)) {
 			res.getError().add(buildError("","订单必须指定。"));
 		}
-		if(fundManageOrderServiceImpl.checkFinanceApproval(orderNo)) {
-			res.getError().add(buildError("","订单非特批或流程不正确。"));
-		}
 		res.data(fundManageOrderServiceImpl.updateFinanceApproval(orderNo));
 		return res;
 	}

+ 62 - 0
src/main/java/com/goafanti/order/enums/ReceivablesStatus.java

@@ -0,0 +1,62 @@
+package com.goafanti.order.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 回款状态
+ *
+ */
+public enum ReceivablesStatus {
+	ZC(0,"正常"),
+	CF(1,"重复"),
+	DCYC(2,"订单异常"),
+	JEYC(3,"金额异常"),
+	MCYC(4,"名称异常"),
+	WZYC(5,"未知异常");
+	
+	private ReceivablesStatus(Integer code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	private static Map<Integer, ReceivablesStatus> status = new HashMap<Integer, ReceivablesStatus>();
+
+	static {
+		for (ReceivablesStatus value : ReceivablesStatus.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+	public static ReceivablesStatus getStatus(Integer code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return ZC;
+	}
+	public static boolean containsType(Integer code) {
+		return status.containsKey(code);
+	}
+	public static String getValueByCode(Integer code){
+        for(ReceivablesStatus bonusSubject:ReceivablesStatus.values()){
+            if(code.equals(bonusSubject.getCode())){
+                return bonusSubject.getDesc();
+            }
+        }
+        return  null;
+    }
+	
+	private Integer	code;
+	private String	desc;
+	public Integer getCode() {
+		return code;
+	}
+	public void setCode(Integer code) {
+		this.code = code;
+	}
+	public String getDesc() {
+		return desc;
+	}
+	public void setDesc(String desc) {
+		this.desc = desc;
+	}
+}

+ 0 - 6
src/main/java/com/goafanti/order/service/FundManageOrderService.java

@@ -98,11 +98,5 @@ public interface FundManageOrderService {
 	 * @return
 	 */
 	int updateFinanceApproval(String orderNo);
-	/**
-	 * 财务特批审核检查
-	 * @param orderNo
-	 * @return
-	 */
-	boolean checkFinanceApproval(String orderNo);
 	
 }

+ 0 - 23
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -154,12 +154,6 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		if (order.getOutsource()==null)order.setOutsource(0);//默认非外包 
 		params.put("o", order);
 		Pagination<OrderListBo> data = (Pagination<OrderListBo>)findPage("financeList", "financeCount", params, pageNo, pageSize);
-		/*List<OrderListBo> list=(List<OrderListBo>) data.getList();
-		for (OrderListBo ob : list) {
-			TOrderBillNew lp=tOrderNewMapper.getLastPayment(ob.getOrderNo());
-			ob.setFinalReceivables(lp.getTransactionAmount().toString());
-			ob.setFinalReceivablesTime(lp.getCreateTimes());
-		}*/
 		result.put("pagination", data);
 		Map<String, Object> count = tOrderNewMapper.countTotalAndActually(order);
 		result.put("count", count);
@@ -294,12 +288,6 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		//这里的已收金额是以前收的所有金额加上本次收的金额
 		orderNew.setSettlementAmount(billNew.getTransactionAmount().add(o.getSettlementAmount()));
 		orderNew.setLiquidationStatus(lstaus);
-		if((lstaus == LiquidationNewState.WAIT_PAY_LAST_BALANCE.getCode() 
-				|| lstaus == LiquidationNewState.ALREADY_PAY.getCode()) 
-					&& o.getProcessStatus() < ProcessStatus.YPZXSGLY.getCode()){
-			//流程状态是3,结算是付款的话
-			orderNew.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());//4
-		}
 		if(result > 0){
 			result = tOrderNewMapper.updateByPrimaryKeySelective(orderNew);
 			//如果达到奖金发放要求新增奖金信息
@@ -517,17 +505,6 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		return tOrderNewMapper.updateByPrimaryKeySelective(t);
 	}
 
-	@Override
-	public boolean checkFinanceApproval(String orderNo) {
-		TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
-		if (t.getApproval()!=ApprovalNewState.TG.getCode()) {
-			return true;
-		}
-		if (t.getProcessStatus()!=ProcessStatus.YPCWZY.getCode()) {
-			return true;
-		}
-		return false;
-	}
 }
 
 

+ 16 - 4
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -5,6 +5,8 @@ import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
@@ -82,6 +84,7 @@ import com.goafanti.order.enums.TaskState;
 import com.goafanti.order.enums.refundState;
 import com.goafanti.order.service.OrderNewService;
 import com.goafanti.order.service.OrderService;
+import com.goafanti.organization.bo.OrganizationListOut;
 
 @Service
 public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> implements OrderNewService {
@@ -442,7 +445,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		t.setOrderNo(orderNo);
 		if (orderStatus==OrderNewState.QDSHTG.getCode()) {
 			if (t2.getApproval()==ApprovalNewState.FTP.getCode()||t2.getApproval()==ApprovalNewState.TG.getCode()) {//如果通过分配给财务管理员
-				t.setProcessStatus(ProcessStatus.YPCWGLY.getCode());
+				t.setProcessStatus(ProcessStatus.YPCWZY.getCode());
+				OrganizationListOut oo=organizationManagementMapper.selectAllById(t2.getOrderDep());
+				t.setFinanceId(oo.getFinanceId());
 			}else {
 				t.setProcessStatus(ProcessStatus.YPTPSH.getCode());
 			}
@@ -570,7 +575,11 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		t.setOrderNo(orderNo);
 		if (confirm==2) {
 			t.setApproval(2);
-			if(t2.getOutsource()==0)t.setProcessStatus(ProcessStatus.YPCWGLY.getCode());
+			if(t2.getOutsource()==0) {
+				OrganizationListOut oo=organizationManagementMapper.selectAllById(t2.getOrderDep());
+				t.setFinanceId(oo.getFinanceId());
+				t.setProcessStatus(ProcessStatus.YPCWZY.getCode());
+			}
 			addOrderLog(orderNo, OrderLogProcess.TP.getCode());
 		} else {
 			t.setApproval(3);
@@ -863,11 +872,14 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public int updateFinance(String orderNo, String newFinance) {
-		checkDeleteSign(orderNo);
 		String aid=TokenManager.getAdminId();
-		return tOrderNewMapper.updateFinance(aid,orderNo,newFinance);
+			String[] l=orderNo.split(",");
+			List<String> orderNos=new ArrayList<>(Arrays.asList(l));
+			tOrderNewMapper.updateFinance(aid,orderNos,newFinance);
+			return 1;
 		
 	}
+	
 
 
 

+ 30 - 12
src/main/java/com/goafanti/order/service/impl/OrderReceivablesServiceImpl.java

@@ -25,6 +25,7 @@ import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.util.StringUtil;
 import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFCellStyle;
 import org.apache.poi.xssf.usermodel.XSSFRow;
@@ -61,6 +62,7 @@ import com.goafanti.order.bo.OrderReportBo;
 import com.goafanti.order.bo.ReceivablesListBo;
 import com.goafanti.order.bo.TOrderBonusBo;
 import com.goafanti.order.bo.TOrderInvoiceBo;
+import com.goafanti.order.bo.TOrderNewBo;
 import com.goafanti.order.bo.TemporaryReceivablesBo;
 import com.goafanti.order.enums.ApprovalNewState;
 import com.goafanti.order.enums.BonusSubject;
@@ -68,6 +70,7 @@ import com.goafanti.order.enums.LiquidationNewState;
 import com.goafanti.order.enums.OrderNewState;
 import com.goafanti.order.enums.ProcessStatus;
 import com.goafanti.order.enums.ProjectNewStage;
+import com.goafanti.order.enums.ReceivablesStatus;
 import com.goafanti.order.enums.TransactionSubject;
 import com.goafanti.order.service.FundManageOrderService;
 import com.goafanti.order.service.OrderBillService;
@@ -116,6 +119,7 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 	@Override
 	public int updateReceivables(TemporaryReceivablesBo t) {
 		t.setOrderNo(t.getOrderNo().trim());
+		t.setStatus(ReceivablesStatus.ZC.getCode());
 		if(t.getReceivablesTimes()!=null) {
 			try {
 				t.setReceivablesTime(DateUtils.StringToDate(t.getReceivablesTimes(), AFTConstants.YYYYMMDD));
@@ -148,13 +152,18 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 			//获取已收款
 			BigDecimal bill = tOrderBillNewMapper.getAmountByOid(tr.getOrderNo());
 			//获取总金额
-			TOrderNew t=tOrderNewMapper.selectByPrimaryKey(tr.getOrderNo());
-			//如果订单不是自己的则也不允许收款
-			if(t==null||t.getOrderNo()==null||!t.getFinanceId().equals(TokenManager.getAdminId())) {
-				tr.setStatus(2);
+			TOrderNewBo t=tOrderNewMapper.getOrderNewDetail(tr.getOrderNo());
+			//订单匹配不到
+			if(t==null||t.getOrderNo()==null) {
+				tr.setStatus(ReceivablesStatus.DCYC.getCode());
+				temporaryReceivablesMapper.updateByPrimaryKeySelective(tr);
+				continue;
+			}else if(!tr.getCorporateName().equals(t.getUserName())) {
+				tr.setStatus(ReceivablesStatus.MCYC.getCode());
 				temporaryReceivablesMapper.updateByPrimaryKeySelective(tr);
 				continue;
 			}
+				
 			//计算收款结果
 			BigDecimal bd = bill.add(tr.getAmount().abs());
 			
@@ -172,7 +181,7 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 			bonus.setGrantBy(TokenManager.getAdminId());
 			int lstaus = 0;//如果订单流水小于首付 lstaus 0
 			if(count.compareTo(t.getTotalAmount()) == 1){//如果订单流水总额大于总金额 return -1
-				tr.setStatus(2);
+				tr.setStatus(ReceivablesStatus.JEYC.getCode());
 				temporaryReceivablesMapper.updateByPrimaryKeySelective(tr);
 				continue;
 			}else if (count.compareTo(t.getTotalAmount()) == 0) {//等于总额
@@ -247,12 +256,6 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 			//这里的已收金额是以前收的所有金额加上本次收的金额
 			orderNew.setSettlementAmount(count);
 			orderNew.setLiquidationStatus(lstaus);
-			if((lstaus == LiquidationNewState.WAIT_PAY_LAST_BALANCE.getCode() 
-					|| lstaus == LiquidationNewState.ALREADY_PAY.getCode()) 
-						&& t.getProcessStatus() < ProcessStatus.YPZXSGLY.getCode()){
-				//流程状态是3,结算是付款的话
-				orderNew.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());//4
-			}
 			tOrderNewMapper.updateByPrimaryKeySelective(orderNew);
 				//如果达到奖金发放要求新增奖金信息
 				if(null != bonus.getBonusSubject()){
@@ -271,7 +274,6 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 		}else {
 			return -1;
 		}
-			
 		LoggerUtils.debug(getClass(), "=========================批量导入结束===================");
 		return 1;
 	}
@@ -300,6 +302,22 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 		if(null!=status)parameter.put("status", status);
 		if(StringUtils.isNotBlank(TokenManager.getAdminId()))parameter.put("aid", TokenManager.getAdminId());
 		Pagination<ReceivablesListBo> p=(Pagination<ReceivablesListBo>) findPage("selectReceivablesList", "selectReceivablesCount", parameter, pageNo, pageSize);
+		List<ReceivablesListBo> list=(List<ReceivablesListBo>) p.getList();
+		
+		for (ReceivablesListBo r : list) {
+			//设置导入信息数据是否有问题判断
+			// InptStatus 0 正常 1内容不完整 2订单未能匹配 3名称不匹配
+			if (StringUtils.isBlank(r.getAmount())||StringUtils.isBlank(r.getOrderNo())
+					||StringUtils.isBlank(r.getCorporateName())||r.getReceivablesTimes()==null) {
+				r.setInptStatus(1);
+			}else if(r.getTotalAmount()==null) {
+				r.setInptStatus(2);
+			}else if(!r.getCorporateName().equals(r.getNickname())) {
+				r.setInptStatus(3);
+			}else {
+				r.setInptStatus(0);
+			}
+		}
 		return p;
 	}
 	

+ 8 - 1
src/main/java/com/goafanti/order/service/impl/OutsourceOrgServiceImpl.java

@@ -10,6 +10,7 @@ import org.hibernate.validator.constraints.Mod11Check.ProcessingDirection;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.common.dao.OrganizationManagementMapper;
 import com.goafanti.common.dao.OutsourceOrganizationMapper;
 import com.goafanti.common.dao.TOrderLogMapper;
 import com.goafanti.common.dao.TOrderNewMapper;
@@ -27,11 +28,14 @@ import com.goafanti.order.bo.OutsourceOrganizationBo;
 import com.goafanti.order.enums.ProcessStatus;
 import com.goafanti.order.service.OrderService;
 import com.goafanti.order.service.OutsourceOrgService;
+import com.goafanti.organization.bo.OrganizationListOut;
 @Service
 public class OutsourceOrgServiceImpl  extends BaseMybatisDao<TOrderOutsourceMapper> implements OutsourceOrgService {
 	@Autowired
 	private OutsourceOrganizationMapper  outsourceOrganizationMapper;
 	@Autowired
+	private OrganizationManagementMapper	organizationManagementMapper;
+	@Autowired
 	private TOrderOutsourceMapper	tOrderOutsourceMapper;
 	@Autowired
 	private TOrderNewMapper	tOrderNewMapper;
@@ -94,7 +98,10 @@ public class OutsourceOrgServiceImpl  extends BaseMybatisDao<TOrderOutsourceMapp
 		if (o.getRefundStatus()==1) {
 			t.setOrderNo(o.getOrderNo());
 			t.setOrderStatus(2);//订单审核标记通过
-			t.setProcessStatus(ProcessStatus.YPCWGLY.getCode());
+			TOrderNew t2=tOrderNewMapper.selectByPrimaryKey(o.getOrderNo());
+			OrganizationListOut oo=organizationManagementMapper.selectAllById(t2.getOrderDep());
+			t.setFinanceId(oo.getFinanceId());
+			t.setProcessStatus(ProcessStatus.YPCWZY.getCode());
 			addOrderLog(o.getOrderNo(),OrderLogProcess.WBSH.getCode());
 			tOrderNewMapper.updateByPrimaryKeySelective(t);
 		}else {

+ 15 - 0
src/main/java/com/goafanti/organization/bo/OrganizationListOut.java

@@ -35,6 +35,9 @@ public class OrganizationListOut {
 	 * 缩写
 	 */
 	private String abbreviation;
+	private String financeName;
+	
+	private String financeId;
 	public String getUid() {
 		return uid;
 	}
@@ -131,6 +134,18 @@ public class OrganizationListOut {
 	public void setAbbreviation(String abbreviation) {
 		this.abbreviation = abbreviation;
 	}
+	public String getFinanceId() {
+		return financeId;
+	}
+	public void setFinanceId(String financeId) {
+		this.financeId = financeId;
+	}
+	public String getFinanceName() {
+		return financeName;
+	}
+	public void setFinanceName(String financeName) {
+		this.financeName = financeName;
+	}
 	
 	
 	

+ 3 - 5
src/main/java/com/goafanti/organization/controller/AdminOrganizationController.java

@@ -107,7 +107,7 @@ public class AdminOrganizationController extends BaseApiController{
 	/**修改信息**/
 	@RequestMapping(value = "/updateOrganization" , method = RequestMethod.POST)
 	public Result updateOrganization(String name, String type, String managerId, String superId, String status,
-			String remarks,String id,String abbreviation){
+			String remarks,String id,String abbreviation,String financeId){
 		Result res = new Result();
 		if(StringUtils.isBlank(name) || StringUtils.isBlank(type)
 				|| StringUtils.isBlank(managerId)|| StringUtils.isBlank(superId)
@@ -116,8 +116,6 @@ public class AdminOrganizationController extends BaseApiController{
 			return res;
 		}		
 		String sdepNo=organizationManagementMapper.selectDepNo(superId);//No
-	/*	String sdepNo=organizationManagementMapper.selectDepNoByName(superId);*/
-     /*superId=organizationManagementMapper.selectIdByName(superId);*/
 		int Count=organizationManagementMapper.selectDepNoCount(superId);//14
 		if((Count+1)>99){
 			res.getError().add(buildError("","每层最多存在99个子类"));
@@ -136,7 +134,7 @@ public class AdminOrganizationController extends BaseApiController{
 				}
 				sid=organizationManagementMapper.selectIdByDepNo(dep);				
 			}
-			i=organizationService.updateOrganization(name, type, managerId, superId, status, remarks,id,dep,abbreviation);
+			i=organizationService.updateOrganization(name, type, managerId, superId, status, remarks,id,dep,abbreviation,financeId);
 		}
 		if(Count>=10){
 			String dep=sdepNo+Count;
@@ -146,7 +144,7 @@ public class AdminOrganizationController extends BaseApiController{
 				dep=sdepNo+Count;
 				sid=organizationManagementMapper.selectIdByDepNo(dep);				
 			}
-			i=organizationService.updateOrganization(name, type, managerId, superId, status, remarks,id,dep,abbreviation);
+			i=organizationService.updateOrganization(name, type, managerId, superId, status, remarks,id,dep,abbreviation,financeId);
 		}
 		
 		return res.data(i);

+ 1 - 1
src/main/java/com/goafanti/organization/service/OrganizationService.java

@@ -39,6 +39,6 @@ public interface OrganizationService {
 	
 	int deleteById(String id);
 	
-	int updateOrganization(String name,String type,String managerId,String superId,String status,String remarks,String id,String depn,String abbreviation);
+	int updateOrganization(String name,String type,String managerId,String superId,String status,String remarks,String id,String depn,String abbreviation,String financeId);
 	
 }

+ 2 - 1
src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java

@@ -96,7 +96,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 		return 1;
 	}
 	@Override
-	public int updateOrganization(String name, String type, String managerId, String superId, String status,String remarks,String id,String depn,String abbreviation) {
+	public int updateOrganization(String name, String type, String managerId, String superId, String status,String remarks,String id,String depn,String abbreviation,String financeId) {
 		Date now=new Date();
 		OrganizationManagement om=new OrganizationManagement();
 		om.setName(name);
@@ -109,6 +109,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 		om.setRemarks(remarks); 
 		om.setId(id);
 		om.setAbbreviation(abbreviation);
+		om.setFinanceId(financeId);
 		int x=organizationManagementMapper.updateByPrimaryKeySelective(om);
 		//*******下级编号修改
 		int n=0;