Merge remote-tracking branch 'upsteam/master'

kmall-admin/src/main/java/com/kmall/admin/cuspay/biz/merch/MerchantNoticeBiz.java

@@ -122,6 +122,8 @@ public class MerchantNoticeBiz {
                 orderProcessRecordService.updateMallOrderProcessRecord(recordMap);
                 Map<String, Object> alipayMap = ImmutableMap.of("orderSn", noti.getOrderSn(), "buyerPayCheck", noti.getBuyerPayerCheck());
                 orderService.updateBuyerPayCheck(alipayMap);
+                noti.setIsStoped(MerchNoticeDict.IsStopStatus.i_1.getItem());
+                noti.setNotiStatue(MerchNoticeDict.NoticeStatus.i_2.getItem());
             }
             noticeList.add(noti);
         });

kmall-admin/src/main/java/com/kmall/admin/cuspay/task/CuspayTask.java

@@ -14,20 +14,20 @@ import org.springframework.stereotype.Component;
  * @version 1.0
  * 2018-05-23 09:31
  */
-@Component
+//@Component
 public class CuspayTask {
-    @Autowired
-    private MerchantNoticeBiz merchantNoticeBiz;
+//    @Autowired
+//    private MerchantNoticeBiz merchantNoticeBiz;
+//
+//    @Autowired
+//    private WxCusDeclareBiz wxCusDeclareBiz;
+//
+//    @Autowired
+//    private WxCusDeclareQueryBiz wxCusDeclareQueryBiz;
 
-    @Autowired
-    private WxCusDeclareBiz wxCusDeclareBiz;
-
-    @Autowired
-    private WxCusDeclareQueryBiz wxCusDeclareQueryBiz;
-
-    @Scheduled(fixedRate = 10000)
-    public void task() {
+//    @Scheduled(fixedRate = 10000)
+//    public void task() {
        // todo,商户通知请求回执
        // merchantNoticeBiz.biz(null);
-    }
+//    }
 }