From 554de444b87aab5f93cb1593a8095612cf9479a7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 09 六月 2020 17:34:30 +0800
Subject: [PATCH] 订单
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/BoutiqueAutoRuleAdminController.java | 36 ++++--------------------------------
1 files changed, 4 insertions(+), 32 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/BoutiqueAutoRuleAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/BoutiqueAutoRuleAdminController.java
index be66370..76a0f67 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/BoutiqueAutoRuleAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/BoutiqueAutoRuleAdminController.java
@@ -338,7 +338,6 @@
@RequestMapping(value = "delete")
public void delete(String callback, Long id, PrintWriter out) {
try {
-
if (id == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇蜂紶閫掓纭弬鏁�"));
return;
@@ -372,11 +371,8 @@
*/
@RequestMapping(value = "shutdownJobs")
public void shutdownJobs(String callback, PrintWriter out) {
-
try {
-
boutiqueAutoRuleService.shutdownJobs();
-
} catch (Exception e) {
e.printStackTrace();
}
@@ -388,16 +384,12 @@
* @param boutiqueAutoRule
*/
public void transformJsonString(BoutiqueAutoRule boutiqueAutoRule){
-
-
JSONObject data = new JSONObject();
-
Integer source = boutiqueAutoRule.getSource();
+ // 绫荤洰id
if (source.equals(BoutiqueAutoRule.TB_OPTIONAL)) {
- // 绫荤洰id
data.put("systemCid", boutiqueAutoRule.getClassName());
}
-
if (boutiqueAutoRule.getKey() != null){
// 鎼滅储鍏抽敭璇�
@@ -446,8 +438,6 @@
data.put("endZkPrice", boutiqueAutoRule.getEndZkPrice());
}
-
-
if ( boutiqueAutoRule.getStartPrice() != null){
// 鍒稿悗浠疯寖鍥村皬鍊�
data.put("startPrice", boutiqueAutoRule.getStartPrice());
@@ -509,24 +499,24 @@
// 璇锋眰鏈�澶ч〉鐮�
if (boutiqueAutoRule.getClassName() != null){
-
if (source.equals(BoutiqueAutoRule.TB_OPTIONAL) || source== BoutiqueAutoRule.TB_OPTIONAL) {
-
String classId = boutiqueAutoRule.getClassName();
if (!StringUtil.isNullOrEmpty(classId)){
GoodsClass rb = goodsClassService.getGoodsClass(Long.parseLong(classId));
if (rb != null) {
data.put("sourceCalss", rb.getName());
+ boutiqueAutoRule.setSourceCalss(rb.getName());
}
}
-
} else if (source.equals(BoutiqueAutoRule.TB_MATERIAL) || source == BoutiqueAutoRule.TB_MATERIAL) {
String subName = boutiqueAutoRule.getSubclassName();
String superName = boutiqueAutoRule.getClassName();
if (StringUtil.isNullOrEmpty(subName)) {
data.put("sourceCalss", superName);
+ boutiqueAutoRule.setSourceCalss(superName);
} else {
data.put("sourceCalss", superName +" "+ subName);
+ boutiqueAutoRule.setSourceCalss(superName +" "+ subName);
}
}
}
@@ -541,7 +531,6 @@
* @param boutiqueAutoRule
*/
public void jsonTransformString(BoutiqueAutoRule boutiqueAutoRule){
-
String searchContent = boutiqueAutoRule.getSearchContent();
if (StringUtil.isNullOrEmpty(searchContent)) {
return;
@@ -647,7 +636,6 @@
// 鏄惁鍖呴偖锛�1 鏈� 0 鏃�
boutiqueAutoRule.setMaxPage((int)jsonData.get("maxPage"));
}
-
}
/**
@@ -758,12 +746,9 @@
// 鐢熸晥鏃堕棿
Date startTime = boutiqueAutoRule.getStartTime();
-
// 澶辨晥鏃堕棿
Date endTime = boutiqueAutoRule.getEndTime();
-
if (endTime != null) {
-
if (startTime != null && startTime.getTime() > endTime.getTime()){
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢熸晥鏃堕棿涓嶈兘澶т簬澶辨晥鏃堕棿"));
return false;
@@ -774,26 +759,13 @@
calendar.set(Calendar.HOUR, 23);
calendar.set(Calendar.MINUTE, 59);
calendar.set(Calendar.SECOND, 59);
-
boutiqueAutoRule.setEndTime(calendar.getTime());
}
if (startTime == null) {
boutiqueAutoRule.setStartTime(new Date());
}
-
-
return true;
- }
-
-
- public static void main(String[] args) {
- String s = "abacada";
- if (s.contains("a")) {
- System.out.println(1);
- } else {
- System.out.println(0);
- }
}
}
--
Gitblit v1.8.0