|
@@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo;
|
|
|
import com.mysql.jdbc.StringUtils;
|
|
import com.mysql.jdbc.StringUtils;
|
|
|
import org.apache.commons.logging.Log;
|
|
import org.apache.commons.logging.Log;
|
|
|
import org.apache.commons.logging.LogFactory;
|
|
import org.apache.commons.logging.LogFactory;
|
|
|
|
|
+import org.linlinjava.litemall.core.system.SystemConfig;
|
|
|
import org.linlinjava.litemall.core.util.ResponseUtil;
|
|
import org.linlinjava.litemall.core.util.ResponseUtil;
|
|
|
import org.linlinjava.litemall.core.validator.Order;
|
|
import org.linlinjava.litemall.core.validator.Order;
|
|
|
import org.linlinjava.litemall.core.validator.Sort;
|
|
import org.linlinjava.litemall.core.validator.Sort;
|
|
@@ -185,6 +186,9 @@ public class WxGoodsController {
|
|
|
data.put("attribute", goodsAttributeListTask.get());
|
|
data.put("attribute", goodsAttributeListTask.get());
|
|
|
data.put("brand", brandCallableTask.get());
|
|
data.put("brand", brandCallableTask.get());
|
|
|
data.put("groupon", grouponRulesCallableTask.get());
|
|
data.put("groupon", grouponRulesCallableTask.get());
|
|
|
|
|
+ //SystemConfig.isAutoCreateShareImage()
|
|
|
|
|
+ data.put("share", SystemConfig.isAutoCreateShareImage());
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
catch (Exception e) {
|
|
catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|