Browse Source

Merge remote-tracking branch 'origin/test' into dev

anderx 7 years ago
parent
commit
722a175823

+ 2 - 0
src/main/java/com/goafanti/common/dao/TOrderBonusMapper.java

@@ -114,4 +114,6 @@ public interface TOrderBonusMapper {
 	List<TOrderBonusBo> getSaleBounsList(TOrderBonusBo bonusBo);
 	
 	int checkByOnoAndSub(TOrderBonus bonus);
+	
+	int checkNoPay(TOrderBonusBo bonusBo);
 }

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

@@ -427,7 +427,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, o.proof_status as proofStatus,
-	ad.name as byName
+	ad.name as byName, 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
@@ -453,7 +453,7 @@
 	<bind name="e" value="b.endTime +'-31'"/>
 	and o.sign_time between #{a,jdbcType=VARCHAR} and #{e,jdbcType=VARCHAR}
 	</if>
-	order by b.grant_status , b.create_time
+	order by b.grant_status , b.create_time desc
 	<if test="page_sql != null">
 		${page_sql}
 	</if>
@@ -550,7 +550,7 @@
 	 	<bind name="e" value="endTime +'-31'"/>
 	 	and o.sign_time between #{a,jdbcType=VARCHAR} and #{e,jdbcType=VARCHAR}
   		</if>
-  		order by b.grant_status ,b.create_time 
+  		order by b.grant_status ,b.create_time desc
   </select>
   <!-- 查看营销员的奖金数据 -->
   <select id="getSaleBounsList" parameterType="com.goafanti.order.bo.TOrderBonusBo" resultType="com.goafanti.order.bo.TOrderBonusBo">
@@ -588,4 +588,12 @@
   <select id="checkByOnoAndSub" parameterType="com.goafanti.common.model.TOrderBonus" resultType="java.lang.Integer">
   	select count(*) from t_order_bonus where order_no = #{orderNo,jdbcType=VARCHAR} and bonus_subject = #{bonusSubject,jdbcType=INTEGER} 
   </select>
+  <!-- 判断当前订单中有没有未发放的数据 -->
+  <select id="checkNoPay" parameterType="com.goafanti.order.bo.TOrderBonusBo" resultType="java.lang.Integer">
+  	select bonus_subject from t_order_bonus
+	where id = #{id,jdbcType=VARCHAR} and bonus_subject > (
+	select min(bonus_subject) from t_order_bonus 
+	where order_no = #{orderNo,jdbcType=VARCHAR} and grant_status = 0 and grant_type = 0)
+  </select>
+  
 </mapper>

+ 11 - 0
src/main/java/com/goafanti/order/controller/OrderBonusStatisticsApiController.java

@@ -312,4 +312,15 @@ public class OrderBonusStatisticsApiController extends CertifyApiController {
 		return res;
 	}
 	 
+	/**
+	 * 发放营销员奖金
+	 * @param bonusBo
+	 * @return
+	 */
+	@RequestMapping(value = "/saleBonusPayment",method = RequestMethod.POST)
+	public Result saleBonusPayment(TOrderBonusBo bonusBo){
+		Result res = new Result();
+		
+		return res;
+	}
 }

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

@@ -239,7 +239,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		//这里的已收金额是以前收的所有金额加上本次收的金额
 		orderNew.setSettlementAmount(billNew.getTransactionAmount().add(o.getSettlementAmount()));
 		orderNew.setLiquidationStatus(lstaus);
-		if(lstaus == 1 && o.getProcessStatus() == 3){
+		if((lstaus == 1 || lstaus == 2) && o.getProcessStatus() == 3){//流程状态是3,结算是付款的话
 			orderNew.setProcessStatus(4);
 		}
 		if(result > 0){
@@ -385,7 +385,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		cal.setTime(new1.getSignTime());
 		int sy = cal.get(Calendar.YEAR);
 		int sm = cal.get(Calendar.MONTH);
-		Integer month = sy*100+sm;
+		Integer month = sy*100+(sm+1);
 		//重新校对月统计
 		int c = monthReportMapper.updateByMonth(month);
 		LoggerUtils.debug(logger, "更新订单统计【%s】条。", c);

+ 18 - 4
src/main/java/com/goafanti/order/service/impl/OrderBonusServiceImpl.java

@@ -1,5 +1,7 @@
 package com.goafanti.order.service.impl;
 
+import java.util.Calendar;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -84,6 +86,13 @@ public class OrderBonusServiceImpl extends BaseMybatisDao<TOrderBonusMapper> imp
 			m1 = Integer.valueOf(newBo.getEndTime().replaceAll("-", ""));
 			y = Integer.valueOf(newBo.getStartTime().substring(0, newBo.getStartTime().indexOf("-")));
 			y1 = Integer.valueOf(newBo.getEndTime().substring(0, newBo.getEndTime().indexOf("-")));
+		}else{
+			Calendar cal = Calendar.getInstance();
+			cal.setTime(new Date());
+			y = cal.get(Calendar.YEAR);
+			m = y*100 + (cal.get(Calendar.MONTH)+1);
+			y1 = y;
+			m1 = m;
 		}
 		for (TOrderBonusBo orderListBo : list) {
 			//处理月度数据
@@ -94,8 +103,10 @@ public class OrderBonusServiceImpl extends BaseMybatisDao<TOrderBonusMapper> imp
 			List<OrderReportBo> l = orderMonthReportMapper.getMonthReportByMonth(r);
 			if(l.size() == 1){
 				OrderReportBo o = l.get(0);
-				orderListBo.setKejim(o.getKejim());
-				orderListBo.setRenzm(o.getRenzm());
+				if(null != o){
+					orderListBo.setKejim(o.getKejim());
+					orderListBo.setRenzm(o.getRenzm());
+				}
 			}
 			
 			r.setMonth(y);
@@ -104,8 +115,10 @@ public class OrderBonusServiceImpl extends BaseMybatisDao<TOrderBonusMapper> imp
 			List<OrderReportBo> ll = orderMonthReportMapper.getYearReportByYear(r);
 			if(l.size() == 1){
 				OrderReportBo o = ll.get(0);
-				orderListBo.setKejiy(o.getKejiy());
-				orderListBo.setRenzy(o.getRenzy());
+				if(null != o){
+					orderListBo.setKejiy(o.getKejiy());
+					orderListBo.setRenzy(o.getRenzy());
+				}
 			}
 		}
 	}
@@ -169,4 +182,5 @@ public class OrderBonusServiceImpl extends BaseMybatisDao<TOrderBonusMapper> imp
 		XSSFWorkbook wb = ExportExcelUtil.exportDeptBonusInfoS(map);
 		return wb;
 	}
+
 }