|
@@ -9,6 +9,7 @@ import com.iamberry.rst.faces.order.OrderSyncLogService;
|
|
|
import com.iamberry.rst.faces.order.OrderSyncPlatformService;
|
|
|
import com.iamberry.rst.util.GenerateKeyUtil;
|
|
|
import com.iamberry.rst.utils.StitchAttrUtil;
|
|
|
+import com.iamberry.wechat.tools.DateTimeUtil;
|
|
|
import com.iamberry.wechat.tools.ResponseJson;
|
|
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
|
import org.slf4j.Logger;
|
|
@@ -21,10 +22,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
import org.springframework.web.servlet.ModelAndView;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
-import java.util.Calendar;
|
|
|
-import java.util.HashSet;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Set;
|
|
|
+import java.util.*;
|
|
|
|
|
|
/**
|
|
|
* 同步订单
|
|
@@ -71,9 +69,9 @@ public class AdminOrderPlatformController {
|
|
|
@ResponseBody
|
|
|
@RequestMapping("/pull")
|
|
|
public ResponseJson pullOrder(HttpServletRequest request){
|
|
|
- Calendar calendar = Calendar.getInstance();
|
|
|
- calendar.set(2019,2,4);
|
|
|
- Integer num = orderSyncLogService.syncXYTOrder(2,"20",calendar.getTime());
|
|
|
+ Date date = new Date();
|
|
|
+ Date date1 = DateTimeUtil.addHour(date, -23);
|
|
|
+ Integer num = orderSyncLogService.syncXYTOrder(2,"20", date1);
|
|
|
ResponseJson rj = new ResponseJson();
|
|
|
rj.setResultMsg("已同步"+num+"个订单");
|
|
|
return rj;
|