Browse Source

bug修改

limin 7 years ago
parent
commit
6732100912

+ 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);
 }

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

@@ -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;
+	}
 }

+ 1 - 0
src/main/java/com/goafanti/order/service/impl/OrderBonusServiceImpl.java

@@ -169,4 +169,5 @@ public class OrderBonusServiceImpl extends BaseMybatisDao<TOrderBonusMapper> imp
 		XSSFWorkbook wb = ExportExcelUtil.exportDeptBonusInfoS(map);
 		return wb;
 	}
+
 }