Browse Source

bug修改

limin 7 years ago
parent
commit
81d016ce33

+ 6 - 6
src/main/java/com/goafanti/common/mapper/TOrderBillNewMapper.xml

@@ -488,9 +488,9 @@
   	left join admin ad on b.creater = ad.id
   	left join t_order_new o on o.order_no = b.order_no
   	left join admin oa on oa.id = o.salesman_id
-  	where delete_sign = 0 
-  	<if test='b.create != null and b.create != ""'>
-  	and creater = #{creater,jdbcType=VARCHAR}
+  	where b.delete_sign = 0 
+  	<if test='b.creater != null and b.creater != ""'>
+  	and b.creater = #{b.creater,jdbcType=VARCHAR}
   	</if>
   	<if test='b.payerName != null and b.payerName != ""'>
   	<bind name="nn" value="'%' + b.payerName + '%'"/>
@@ -520,9 +520,9 @@
   	left join admin a on b.payee_id = a.id
   	left join t_order_new o on o.order_no = b.order_no
   	left join admin oa on oa.id = o.salesman_id
-  	where delete_sign = 0 
-  	<if test='b.create != null and b.create != ""'>
-  	and creater = #{creater,jdbcType=VARCHAR}
+  	where b.delete_sign = 0 
+  	<if test='b.creater != null and b.creater != ""'>
+  	and b.creater = #{b.creater,jdbcType=VARCHAR}
   	</if>
   	<if test='b.payerName != null and b.payerName != ""'>
   	<bind name="nn" value="'%' + b.payerName + '%'"/>

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

@@ -933,7 +933,9 @@
   <select id="financeList" parameterType="Map" resultType="com.goafanti.order.bo.OrderListBo">
   select  o.order_no as orderNo, o.sign_time as signTime, u.nickname as buyerName, o.order_status as orderStatus, 
   a.name as sellerName, o.salesman_id as sellerId, o.buyer_id as buyerId, o.liquidation_status as liquidationStatus , 
-  ifnull(b.amount,0) as actuallyTotalAmount
+  ifnull(b.amount,0) as actuallyTotalAmount, 
+  o.first_amount as signFirstPayment, o.total_amount as signTotalAmount,
+  0 as companyId, "湖南科德信息咨询有限公司" as companyName
   	 from t_order_new o 
   	 left join `user` u on o.buyer_id = u.id 
   	 left join admin a on o.salesman_id = a.id
@@ -943,6 +945,12 @@
   		and process_status >= 3
   		and (approval = 0 or approval = 2)
 	  	and o.finance_id = #{o.financeId,jdbcType=VARCHAR}
+  		<if test='o.liquidation_status != null and o.liquidation_status != ""'>
+	  	and o.liquidation_status = #{o.liquidation_status,jdbcType=VARCHAR}
+	  	</if>
+  		<if test='o.liquidation_status == null or o.liquidation_status == ""'>
+	  	and o.liquidation_status &lt; 2
+	  	</if>
   		<if test='o.orderNo != null and o.orderNo != ""'>
 	  	and o.order_no = #{o.orderNo,jdbcType=VARCHAR}
 	  	</if>
@@ -971,6 +979,12 @@
   		and process_status >= 3
   		and (approval = 0 or approval = 2)
 	  	and o.finance_id = #{o.financeId,jdbcType=VARCHAR}
+	  	<if test='o.liquidation_status != null and o.liquidation_status != ""'>
+	  	and o.liquidation_status = #{o.liquidation_status,jdbcType=VARCHAR}
+	  	</if>
+  		<if test='o.liquidation_status == null or o.liquidation_status == ""'>
+	  	and o.liquidation_status &lt; 2
+	  	</if>
   		<if test='o.orderNo != null and o.orderNo != ""'>
 	  	and o.order_no = #{o.orderNo,jdbcType=VARCHAR}
 	  	</if>

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

@@ -478,7 +478,7 @@
 	  	<bind name="b" value="r.endTime + ' 23:59:59'"/>
 	  	and o.sign_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
 	</if>
-	order by r.refundStatus
+	order by r.refund_status
   	<if test="page_sql!=null">
 	 ${page_sql}
 	</if>

+ 17 - 0
src/main/java/com/goafanti/order/bo/OrderListBo.java

@@ -64,6 +64,11 @@ public class OrderListBo {
 	/** 搜索结束时间 **/
 	private String endTime;
 	
+	/** 收款公司id **/
+	private String companyId;
+	/** 收款公司名称 **/
+	private String companyName;
+	
 	public String getOrderNo() {
 		return orderNo;
 	}
@@ -238,4 +243,16 @@ public class OrderListBo {
 	public void setEndTime(String endTime) {
 		this.endTime = endTime;
 	}
+	public String getCompanyId() {
+		return companyId;
+	}
+	public void setCompanyId(String companyId) {
+		this.companyId = companyId;
+	}
+	public String getCompanyName() {
+		return companyName;
+	}
+	public void setCompanyName(String companyName) {
+		this.companyName = companyName;
+	}
 }

+ 7 - 2
src/main/java/com/goafanti/order/bo/OrderRefundBo.java

@@ -12,6 +12,7 @@ public class OrderRefundBo extends TOrderRefund {
 	private String saleId;
 	private String startTime;
 	private String endTime;
+	private Integer refundStatus;
 	public String getBuyName() {
 		return buyName;
 	}
@@ -60,6 +61,10 @@ public class OrderRefundBo extends TOrderRefund {
 	public void setEndTime(String endTime) {
 		this.endTime = endTime;
 	}
-	
-	
+	public Integer getRefundStatus() {
+		return refundStatus;
+	}
+	public void setRefundStatus(Integer refundStatus) {
+		this.refundStatus = refundStatus;
+	}
 }

+ 9 - 6
src/main/java/com/goafanti/order/controller/FundManagerOrderApiController.java

@@ -42,9 +42,11 @@ public class FundManagerOrderApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value="/allUnassignedOrder",method = RequestMethod.GET)
-	public Result allUnassignedOrder(OrderListBo order, Integer pageNo, Integer pageSize ){
+	public Result allUnassignedOrder(OrderListBo order, Integer pageNo, Integer pageSize){
 		Result res = new Result();
-		order.setProjectStage(2);
+		//判断当前登录的角色是不是财务管理员
+		
+		order.setProcessStatus(2);//订单状态为2
 		res.setData(fundManageOrderServiceImpl.allUnassignedOrder(order, pageNo, pageSize,1));
 		return res;
 	}
@@ -58,7 +60,7 @@ public class FundManagerOrderApiController extends CertifyApiController {
 	@RequestMapping(value="/distributionFinance", method = RequestMethod.POST)
 	public Result distributionFinance(String orderNo, String financeId, Integer approval){
 		Result res = new Result();
-		Integer r = fundManageOrderServiceImpl.distributionFinance(orderNo, financeId, approval);
+		Integer r = fundManageOrderServiceImpl.updateDistributionFinance(orderNo, financeId, approval);
 		if(r == -1){
 			res.getError().add(buildError("", "未通过特批不能分配"));
 			return res;
@@ -83,7 +85,8 @@ public class FundManagerOrderApiController extends CertifyApiController {
 		Result res = new Result();
 		//财务专员自己的id
 		order.setFinanceId(TokenManager.getAdminId());
-		order.setProjectStage(3);
+		order.setProcessStatus(3);//分配给自己
+		order.setOrderStatus(2);//营销管理员审核通过
 		res.setData(fundManageOrderServiceImpl.financeList(order, pageNo, pageSize));
 		return res;
 	}
@@ -100,7 +103,7 @@ public class FundManagerOrderApiController extends CertifyApiController {
 			res.getError().add(buildError("", "驳回原因长度不能大于256"));
 			return res;
 		}
-		Integer i = fundManageOrderServiceImpl.reject(orderBack);
+		Integer i = fundManageOrderServiceImpl.updateReject(orderBack);
 		if(i>0){
 			res.setData("驳回处理成功!");
 		}else{
@@ -165,7 +168,7 @@ public class FundManagerOrderApiController extends CertifyApiController {
 			res.getError().add(buildError("", "审批意见长度不能大于256"));
 			return res;
 		}
-		int r = fundManageOrderServiceImpl.changeRefund(refund);
+		int r = fundManageOrderServiceImpl.updateChangeRefund(refund);
 		if(r>0){
 			res.setData("审核退款成功!");
 		}else{

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

@@ -33,14 +33,14 @@ public interface FundManageOrderService {
 	 * @param financeId
 	 * @return
 	 */
-	Integer distributionFinance(String orderid, String financeId, Integer approval);
+	Integer updateDistributionFinance(String orderid, String financeId, Integer approval);
 	
 	/**
 	 * 财务专员驳回
 	 * @param back
 	 * @return
 	 */
-	Integer reject(TOrderBack back);
+	Integer updateReject(TOrderBack back);
 	
 	/**
 	 * 财务专员添加收款流水
@@ -55,7 +55,7 @@ public interface FundManageOrderService {
 	 * @param refund
 	 * @return
 	 */
-	Integer changeRefund(TOrderRefund refund);
+	Integer updateChangeRefund(TOrderRefund refund);
 	
 	/**
 	 * 财务专员新增退单流水

+ 26 - 11
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -44,6 +44,20 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 	@Override
 	public Pagination<OrderListBo> allUnassignedOrder(OrderListBo order, Integer pageNo,
 			Integer pageSize,Integer ob) {
+		BigDecimal b1 = new BigDecimal(2);
+		BigDecimal b2 = new BigDecimal(0.2);
+		BigDecimal b3 = new BigDecimal(0.4);
+		BigDecimal b4 = new BigDecimal(0.5);
+		System.out.println("b1 b2 " +b1.compareTo(b2));
+		System.out.println("b2 b1 " +b2.compareTo(b1));
+		System.out.println("b1 b3 " +b1.compareTo(b3));
+		System.out.println("b1+b2 b3 " +b1.add(b2).compareTo(b3));
+		System.out.println("b1+b2 b4 " +b1.add(b2).compareTo(b4));
+		System.out.println(" b4 b1+b2  " +b4.compareTo(b1.add(b2)));
+		System.out.println("b1 b2 b3 b4   " + b1.toString() + "  " + b2.toString() + "  " + b3.toString() + "  "+  b4.toString());
+		
+		 
+		
 		Map<String, Object> params = new HashMap<String, Object>();
 		params.put("o", order);
 		params.put("ob", ob);
@@ -52,10 +66,10 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 	}
 	
 	@Override
-	public Integer distributionFinance(String orderNo, String financeId, Integer approval) {
+	public Integer updateDistributionFinance(String orderNo, String financeId, Integer approval) {
 		// 先判断订单id和财务专员是否存在或者能够使用
 		//判断是不是特批的数据
-		if(approval != 2){//特批未通过
+		if(approval != 2 && approval != 0){//特批未通过
 			return -1;
 		}
 		TOrderNew onew = new TOrderNew();
@@ -73,7 +87,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 			TOrderNew record = new TOrderNew();
 			record.setOrderNo(orderNo);
 			record.setFinanceId(financeId);
-			record.setProjectStatus(3);
+			record.setProcessStatus(3);
 			r = tOrderNewMapper.updateByPrimaryKeySelective(record);
 		}else{
 			//返回错误标志 提示订单编号或者财务专员选择错误
@@ -93,7 +107,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 	}
 
 	@Override
-	public Integer reject(TOrderBack back) {
+	public Integer updateReject(TOrderBack back) {
 		// 是否已经收款
 		BigDecimal bd = billNewMapper.getAmountByOid(back.getOrderNo());
 		if(bd.compareTo(new BigDecimal(0.0)) == 1){
@@ -121,20 +135,25 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 
 	@Override
 	public Integer addReceiptsFlow(TOrderBillNew billNew) {
+		
 		//判断有没有要加入的金额有没有超过总金额
-		BigDecimal bd = billNewMapper.getAmountByOid(billNew.getOrderNo());
+		BigDecimal bill = billNewMapper.getAmountByOid(billNew.getOrderNo());
 		//获得的单个订单金额数据(首付金额和总金额)
 		TOrderNew o = tOrderNewMapper.selectByPrimaryKey(billNew.getOrderNo());
 		if(null == o){
 			return -2;
 		}
-		bd.add(billNew.getTransactionAmount().abs());
+		BigDecimal bd = bill.add(billNew.getTransactionAmount().abs());
 		int lstaus = 0;
 		
 		//如果订单流水总额大于总金额 return -1
 		//如果订单流水等于于总金额 lstaus 2
 		//如果订单流水小于总金额大于首付 lstaus 1
 		//如果订单流水小于首付 lstaus 0
+		
+		// 0 相等
+		// -1 小于 
+		// 1 大于
 		if(bd.compareTo(o.getTotalAmount()) == 1){
 			return -1;//超过不能添加
 		}else if(bd.compareTo(o.getTotalAmount()) == 0){
@@ -145,7 +164,6 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		//否则新增流水信息
 		billNew.setBillNo(idGenerator.generateId().toString());
 		billNew.setCreater(TokenManager.getAdminId());
-		billNew.setCreater("1");
 		int result = billNewMapper.insertSelective(billNew);
 		
 		//修改订单结算金额和结算状态
@@ -165,16 +183,13 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 	}
 
 	@Override
-	public Integer changeRefund(TOrderRefund refund) {
+	public Integer updateChangeRefund(TOrderRefund refund) {
 		//查看当前退单状态
 		TOrderRefund d = refundMapper.selectByPrimaryKey(refund.getId());
 		if(d.getRefundStatus() != 0){
 			return -1;
 		}
 		
-		
-		//TODO 这里是否要修改订单状态待确定
-		
 		//修改退单审核状态
 		return refundMapper.updateRefundById(refund);
 	}

+ 4 - 3
src/main/java/com/goafanti/order/service/impl/OrderBillServiceImpl.java

@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.common.dao.TOrderBillNewMapper;
@@ -21,8 +22,8 @@ public class OrderBillServiceImpl extends BaseMybatisDao<TOrderBillNewMapper> im
 	
 	@Autowired
 	private TOrderBillNewMapper billNewMapper;
-//	@Value(value = "${upload.path}")
-//	private String	uploadPath = null;
+	@Value(value = "${upload.path}")
+	private String	uploadPath = null;
 
 
 	@SuppressWarnings("unchecked")
@@ -60,7 +61,7 @@ public class OrderBillServiceImpl extends BaseMybatisDao<TOrderBillNewMapper> im
 			map.put(billNew.getDepartmentName(), billNewMapper.getBillData(billNew));
 		}
 		String[] comment = {"平台流水编号","平台流水时间","交易金额","付款方","收款方","流水科目","交易渠道","交易时间","财务流水号","订单编号","订单负责人"};
-		String filePath = "F:/data/public/upload" + "/billtemp";
+		String filePath = uploadPath + "/billtemp";
 		File f = new File(filePath);
 		if(!f.exists()){
 			f.mkdirs();