上朵分销系统

tooth-wechat-interface/src/main/java/com/iamberry/wechat/face/channel/ChannelRebateService.java

@@ -19,6 +19,12 @@ public interface ChannelRebateService {
      */
     PagedResult<ChannelRebate> getChannelRebateList(PageRequest<ChannelRebate> pageRequest);
     /**
+     * 获取集合
+     * @param
+     * @return List
+     */
+    List<ChannelRebate> listChannelRebate(ChannelRebate channelRebate);
+    /**
      * 查询单条数据
      * @param  id
      * @return  channelRebate

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/channel/ChannelRebateServiceImpl.java

@@ -32,6 +32,12 @@ public class ChannelRebateServiceImpl  implements ChannelRebateService {
         List<ChannelRebate> customerBasicList = channelRebateMapper.getChannelRebateList(pageRequest.getData());
         return PageUtil.getPage(customerBasicList);
     }
+
+    @Override
+    public List<ChannelRebate> listChannelRebate(ChannelRebate channelRebate) {
+        return channelRebateMapper.getChannelRebateList(channelRebate);
+    }
+
     /**
      * 查询单条数据
      * @param  id

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/chargerReceiveMapper.xml

@@ -378,7 +378,7 @@
         AND t.receive_post_num = #{receivePostNum}
       </if>
     </where>
-    ORDER BY t.receive_create_time
+    ORDER BY t.receive_id DESC
   </select>
 
   <!-- 获取用户所注册的机器数量 -->

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/mq/MQTask.java

@@ -8,14 +8,17 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
 import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
+import com.iamberry.wechat.core.entity.channel.ChannelRebate;
 import com.iamberry.wechat.core.entity.coupon.CouponItem;
 import com.iamberry.wechat.core.entity.integral.IntegralConfig;
 import com.iamberry.wechat.core.entity.integral.UseIntegral;
 import com.iamberry.wechat.core.entity.member.Member;
 import com.iamberry.wechat.core.entity.order.NumberBacklogDto;
+import com.iamberry.wechat.core.entity.order.Order;
 import com.iamberry.wechat.core.entity.report.Report;
 import com.iamberry.wechat.face.admin.SystemService;
 import com.iamberry.wechat.face.agentInfo.AgentPurchaseOrderService;
+import com.iamberry.wechat.face.channel.ChannelRebateService;
 import com.iamberry.wechat.face.coupon.CouponItemService;
 import com.iamberry.wechat.face.integral.UseIntegralService;
 import com.iamberry.wechat.face.member.MemberService;
@@ -85,6 +88,8 @@ public class MQTask implements InitializingBean {
 	private MemberService memberService;
 	@Autowired
 	private ReportService reportService;
+	@Autowired
+	private ChannelRebateService channelRebateService;
 
 	private Lock lock = new ReentrantLock();
 
@@ -528,5 +533,40 @@ public class MQTask implements InitializingBean {
 	}
 
 
+	/**
+	 * 上朵分销返利定时任务
+	 * 每天1点
+	 */
+	@SuppressWarnings(value = {"unchecked", "rawtypes"})
+//	@Scheduled(cron = "0 0/2 * * * ?")	//每三分钟执行一次
+	@Scheduled(cron = "0 0 1 * * ?")	//每天1点触发
+	public void channelRebate() {
+		logger.info("上朵分销返利任务开始");
+		ChannelRebate channelRebate = new ChannelRebate();
+		channelRebate.setRebackStatus(1);
+		List<ChannelRebate> channelRebateList = channelRebateService.listChannelRebate(channelRebate);
+		Integer num = Integer.valueOf(systemService.selectOneShopRuleById(258).getRuleNum().intValue());		//10
+		logger.info("上朵分销返利订单处理时间为："+num + "天");
+		for (ChannelRebate cr:channelRebateList) {
+			Order order = adminOrderService.getShopOrderByOrderId(cr.getSalesOrderid());
+			Calendar calendar = Calendar.getInstance();
+			calendar.setTime(order.getSalesCreateDate());
+			calendar.add(Calendar.DATE, num);
+			if(calendar.getTime().getTime() < new Date().getTime()){	//如果订单时间+10天 小于 当前时间，那么表示该返利状态更改为已返利（2）
+				ChannelRebate newCr = new ChannelRebate();
+				newCr.setRebateId(cr.getRebateId());
+				newCr.setRebackStatus(2);
+				Integer flag = channelRebateService.update(newCr);
+				if(flag > 0){
+					logger.info("上朵分销返利成功，订单号为："+cr.getSalesOrderid()+"--返利id为："+cr.getRebateId());
+				}else{
+					logger.info("上朵分销返利失败，订单号为："+cr.getSalesOrderid()+"--返利id为："+cr.getRebateId());
+				}
+			}
+		}
+		logger.info("上朵分销返利任务结束");
+	}
+
+
 
 }

tooth-wechat-web/src/main/resources/iamberry-wechat-web-ioc.xml

@@ -51,7 +51,7 @@
 	<bean id="loadResultInfo" class="com.iamberry.wechat.tools.loadResultUtil" lazy-init="false"></bean>
 	
 	<!-- 开启注解启动定时器  -->
-  <!--  <task:annotation-driven/>-->
+    <!--<task:annotation-driven/>-->
     
     <!-- 将30天后奖励积分的定时任务的xml引入-->
 	<!--<import resource="classpath:iamberry-wechat-service-orderTesk.xml"></import>-->