Просмотр исходного кода

修改合同编号,营销员奖金导出修改

limin лет назад: 7
Родитель
Сommit
20b3bf5e42

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

@@ -619,7 +619,7 @@
 	o.first_amount as firstAmount, o.settlement_amount as settlementAmount, o.refund_amount as refundAmount,
 	o.order_status as orderStatus, o.project_status as projectStatus, b.bonus_subject as bonusSubject,
 	o.proof_count as proofCount, b.grant_status as grantStatus, a.name as salesName
-	,b.create_time as startTime1
+	,b.create_time as startTime1, b.grant_target as grantTarget
 	from t_order_bonus b
 	left join t_order_new o on o.order_no = b.order_no
 	left join admin a on o.salesman_id = a.id

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

@@ -1011,7 +1011,7 @@
   <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.contract_no as contractNo,
   o.first_amount as signFirstPayment, o.total_amount as signTotalAmount,
   0 as companyId, "湖南科德信息咨询有限公司" as companyName
   	 from t_order_new o 

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

@@ -454,7 +454,7 @@
   <select id="getRefundList" parameterType="Map" resultType="com.goafanti.order.bo.OrderRefundBo">
   select r.id as id , r.create_time as createTime, r.order_no as orderNo, u.nickname as buyName, u.id as buyid, o.order_status as orderStatus,
   	a.name as saleName, a.id as saleId, o.liquidation_status as liquidationStatus ,reason as reason,refund_status as  refundStatus,
-  	o.refund_amount as refundAmount
+  	o.refund_amount as refundAmount, o.contract_no as contractNo
   	from t_order_refund r
   	 left join t_order_new o on r.order_no = o.order_no
   	 left join `user` u on o.buyer_id = u.id

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

@@ -68,6 +68,8 @@ public class OrderListBo {
 	private String companyId;
 	/** 收款公司名称 **/
 	private String companyName;
+	/** 合同编号 */
+	private String contractNo;
 	
 	public String getOrderNo() {
 		return orderNo;
@@ -255,4 +257,10 @@ public class OrderListBo {
 	public void setCompanyName(String companyName) {
 		this.companyName = companyName;
 	}
+	public String getContractNo() {
+		return contractNo;
+	}
+	public void setContractNo(String contractNo) {
+		this.contractNo = contractNo;
+	}
 }

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

@@ -13,6 +13,7 @@ public class OrderRefundBo extends TOrderRefund {
 	private String startTime;
 	private String endTime;
 	private String refundAmount;
+	private String contractNo;
 	public String getBuyName() {
 		return buyName;
 	}
@@ -67,5 +68,11 @@ public class OrderRefundBo extends TOrderRefund {
 	public void setRefundAmount(String refundAmount) {
 		this.refundAmount = refundAmount;
 	}
+	public String getContractNo() {
+		return contractNo;
+	}
+	public void setContractNo(String contractNo) {
+		this.contractNo = contractNo;
+	}
 	
 }

+ 10 - 2
src/main/java/com/goafanti/order/controller/FundManagerOrderApiController.java

@@ -125,12 +125,20 @@ public class FundManagerOrderApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value="/addReceiptsFlow", method = RequestMethod.POST)
-	public Result addReceiptsFlow(TOrderBillNew billNew){
+	public Result addReceiptsFlow(TOrderBillNew billNew,String contractNo){
 		Result res = new Result();
 		if(null != billNew.getRemarks() && billNew.getRemarks().length() > 255){
 			res.getError().add(buildError("", "备注长度不能大于255"));
 			return res;
 		}
+		
+		if (StringUtils.isBlank(contractNo)) {
+			res.getError().add(buildError("", "合同编号不能为空!"));
+			return res;
+		} else if (contractNo.length() > 32) {
+			res.getError().add(buildError("", "合同编号长度不能大于32!"));
+			return res;
+		}
 		//流水时间处理
 		//if(StringUtils.isNotEmpty(billNew.getFinancialPayTimes())){
 			try {
@@ -141,7 +149,7 @@ public class FundManagerOrderApiController extends CertifyApiController {
 				return res;
 			}
 		//}
-		Integer i = fundManageOrderServiceImpl.addReceiptsFlow(billNew);
+		Integer i = fundManageOrderServiceImpl.addReceiptsFlow(billNew,contractNo);
 		if(i>0){
 			res.setData("新增收款记录成功!");
 		}else if(i == -3){

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

@@ -48,7 +48,7 @@ public interface FundManageOrderService {
 	 * @param billNew
 	 * @return
 	 */
-	Integer addReceiptsFlow(TOrderBillNew billNew);
+	Integer addReceiptsFlow(TOrderBillNew billNew, String contractNo);
 	
 	
 	/**

+ 2 - 1
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -177,7 +177,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 	}
 
 	@Override
-	public Integer addReceiptsFlow(TOrderBillNew billNew) {
+	public Integer addReceiptsFlow(TOrderBillNew billNew, String contractNo) {
 		
 		//判断有没有要加入的金额有没有超过总金额
 		BigDecimal bill = billNewMapper.getAmountByOid(billNew.getOrderNo());
@@ -249,6 +249,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		//如果已经首付并且流程状态是没有派给咨询师的修改流程状态为4
 		TOrderNew orderNew = new TOrderNew();
 		orderNew.setOrderNo(billNew.getOrderNo());
+		orderNew.setContractNo(contractNo);
 		//这里的已收金额是以前收的所有金额加上本次收的金额
 		orderNew.setSettlementAmount(billNew.getTransactionAmount().add(o.getSettlementAmount()));
 		orderNew.setLiquidationStatus(lstaus);