Merge branch 'dev-mysql' into liusw-account-v1.0.10.19

src/main/java/com/uas/platform/b2c/common/account/model/UsageLog.java

@@ -190,6 +190,18 @@ public class UsageLog extends BufferedLogable implements Serializable {
 		this.ip = SystemSession.getUser().getIp();
 	}
 
+	public UsageLog(String title, String message, String detail, String code, Long key, Long enuu, Long useruu) {
+		this.enUU = enuu;
+		this.title = title;
+		this.message = message;
+		this.detail = detail;
+		this.code = code;
+		this.key = key;
+		this.time = new Date().getTime();
+		this.userUU = useruu;
+		this.ip = SystemSession.getUser().getIp();
+	}
+
 	public UsageLog(String title, String message, Long userUU, String ip, String code, Long key) {
 		this.enUU = 0L;
 		this.title = title;

src/main/java/com/uas/platform/b2c/common/account/v2/controller/UserController.java

@@ -4,7 +4,6 @@ import com.uas.account.entity.User;
 import com.uas.platform.b2c.common.account.v2.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -32,12 +31,14 @@ public class UserController {
     /**
      * 删除用户
      *
-     * @param uu
+     * @param
      */
-	@RequestMapping(value = "/removeUser/{uu}", method = RequestMethod.POST)
+	@RequestMapping(value = "/removeUser", method = RequestMethod.POST)
     @ResponseBody
-    public void removeUser(@PathVariable Long uu) {
-        userService.delete(uu);
+    public void removeUser(User user) {
+		Long uu = Long.valueOf(user.getDialectUID());
+		Long enuu = Long.valueOf(user.getSpaceDialectUID());
+        userService.delete(uu, enuu);
     }
 
 }

src/main/java/com/uas/platform/b2c/common/account/v2/service/UserService.java

@@ -17,5 +17,5 @@ public interface UserService {
      *
      * @param uu
      */
-    void delete(Long uu);
+    void delete(Long uu, Long enuu);
 }

src/main/java/com/uas/platform/b2c/common/account/v2/service/impl/EnterpriseServiceImpl.java

@@ -47,9 +47,9 @@ public class EnterpriseServiceImpl implements EnterpriseService {
         enterprise.setUu(Long.valueOf(userSpace.getDialectUID()));
         enterpriseDao.save(enterprise);
         if(null != oldenterprise) {
-            logger.log("更新企业信息", enterprise.getUu()+"time: " + sdf.format(new Date()));
+            logger.log("更新企业信息", enterprise.getUu()+"time: " + sdf.format(new Date()), enterprise.getUu(), 0L);
         } else {
-            logger.log("新增企业信息", enterprise.getUu()+"time: " + sdf.format(new Date()));
+            logger.log("新增企业信息", enterprise.getUu()+"time: " + sdf.format(new Date()), enterprise.getUu(), 0L);
         }
     }
 
@@ -62,7 +62,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
                 if(!CollectionUtils.isEmpty(users)) {
                     enterprise.setEnAdminuu(users.get(0).getUserUU());
                     enterpriseDao.save(enterprise);
-                    logger.log("更换管理员", enterprise.getEnName()+"," +users.get(0).getUserName() + "time:" + sdf.format(new Date()));
+                    logger.log("更换管理员", enterprise.getEnName()+"," +users.get(0).getUserName() + "time:" + sdf.format(new Date()), enterprise.getUu(), enterprise.getEnAdminuu());
                 }
             }
         }

src/main/java/com/uas/platform/b2c/common/account/v2/service/impl/UserServiceImpl.java

@@ -5,7 +5,6 @@ import com.uas.platform.b2c.common.account.dao.EnterpriseDao;
 import com.uas.platform.b2c.common.account.dao.UserDao;
 import com.uas.platform.b2c.common.account.model.Enterprise;
 import com.uas.platform.b2c.common.account.v2.service.UserService;
-import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Status;
@@ -52,32 +51,33 @@ public class UserServiceImpl implements UserService {
         com.uas.platform.b2c.common.account.model.User newUser = userDao.save(u);
         SystemSession.setUser(newUser);
         if(oldUsers.size() > 0) {
-            logger.log("更新用户信息", user.getDialectUID() + "time: " + sdf.format(new Date()));
+            logger.log("更新用户信息", user.getDialectUID() + "time: " + sdf.format(new Date()), enterprise.getUu(), u.getUserUU());
         } else {
             if(null != enterprise && null == enterprise.getEnAdminuu()) {
                 enterprise.setEnAdminuu(u.getUserUU());
                 enterpriseDao.save(enterprise);
-                logger.log("设置管理员", enterprise.getEnName() + "," + u.getUserName() + "time: " + sdf.format(new Date()));
+                logger.log("设置管理员", enterprise.getEnName() + "," + u.getUserName() + "time: " + sdf.format(new Date()), enterprise.getUu(), u.getUserUU());
             }
-            logger.log("新增用户信息", user.getDialectUID() + "time: " + sdf.format(new Date()));
+            logger.log("新增用户信息", user.getDialectUID() + "time: " + sdf.format(new Date()), enterprise.getUu(), u.getUserUU());
         }
     }
 
 
     @Override
-    public void delete(Long uu) {
+    public void delete(Long uu, Long enuu) {
         com.uas.platform.b2c.common.account.model.User user = userDao.findOne(uu);
-        if(null != user) {
-            if (user.getEnterprises().contains(SystemSession.getUser().getEnterprise())) {
-                user.removeEnterprise(SystemSession.getUser().getEnterprise());
+        Enterprise enterprise = enterpriseDao.findByUu(enuu);
+        if(null != user && null != enterprise) {
+            if (user.getEnterprises().contains(enterprise)) {
+                user.removeEnterprise(enterprise);
                 if (user.getEnterprises().size() != 0) {
                     user.setEnable((short) Status.DISABLED.value());
-                    logger.log("删除用户", "禁用" + user.getUserUU());
+                    logger.log("删除用户", "禁用" + user.getUserUU(), 0L, 0L);
                     userDao.save(user);
                 }
                 if (user.getEnterprises().size() == 0) {
                     userDao.delete(user);
-                    logger.log("删除用户", "删除" + user.getUserUU());
+                    logger.log("删除用户", "删除" + user.getUserUU(), 0L, 0L);
                 }
             }
         }

src/main/java/com/uas/platform/b2c/core/filter/SSOInterceptor.java

@@ -266,7 +266,7 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
 			if ("prod".equals(profile)){
 				response.sendRedirect(SSOHelper.getRedirectLoginUrl(request, "https://www.usoftmall.com"+request.getRequestURI()));
 			}else{
-				response.sendRedirect(SSOHelper.getRedirectLoginUrl(request, request.getRequestURL().toString()));
+				response.sendRedirect(SSOHelper.getRedirectLoginUrl(request, request.getParameter("returnURL"))+ "&baseUrl=http://192.168.253.121:3000/login/other" );
 			}
 		} else {
 			SSOHelper.clearRedirectLogin(request, response);

src/main/java/com/uas/platform/b2c/core/support/log/UsageBufferedLogger.java

@@ -31,6 +31,18 @@ public class UsageBufferedLogger extends BufferedLogger<UsageLog> {
 		log(new UsageLog(title, message, null, null, null));
 	}
 
+	/**
+	 * 未登录记录平台使用日志
+	 *
+	 * @param title
+	 *            消息标题
+	 * @param message
+	 *            消息
+	 */
+	public void log(String title, String message, Long enuu, Long useruu) {
+		log(new UsageLog(title, message, null, null, null, enuu, useruu));
+	}
+
 	/**
 	 * 记录平台密码找回日志
 	 * 

src/main/java/com/uas/platform/b2c/prod/commodity/model/ReleaseProductByBatch.java

@@ -17,7 +17,7 @@ import java.util.List;
 
 /**
  * 批量上传商品建立临时表存储相关信息
- * 
+ *
  * @author hejq
  * @time 创建时间：2016年9月24日
  */
@@ -54,16 +54,28 @@ public class ReleaseProductByBatch implements Serializable {
 	@Column(name = "rel_branden")
 	private String brandNameEn;
 
+	/**
+	 * 商城品牌中文
+	 */
+	@Column(name = "rel_b2cbrandcn")
+	private String b2cBrandcn;
+
+	/**
+	 * 品牌品牌uuid
+	 */
+	@Column(name = "rel_b2cbranden")
+	private String b2cBranden;
+
 	/**
 	 * 品牌id
 	 */
-	@Column(name = "rel_brandid")
+	@Column(name = "rel_b2cbrandid")
 	private Long brandId;
 
 	/**
 	 * 品牌品牌uuid
 	 */
-	@Column(name = "br_name_uuid")
+	@Column(name = "rel_b2cbranduuid")
 	private String branduuid;
 
 	/**
@@ -72,10 +84,16 @@ public class ReleaseProductByBatch implements Serializable {
 	@Column(name = "rel_code")
 	private String code;
 
+	/**
+	 * 产品型号
+	 */
+	@Column(name = "rel_b2ccode")
+	private String b2cCode;
+
 	/**
 	 * 产品UUId
 	 */
-	@Column(name = "rel_uuid")
+	@Column(name = "rel_b2cuuid")
 	private String componentUuId;
 
 	/**
@@ -298,7 +316,7 @@ public class ReleaseProductByBatch implements Serializable {
 
 	/**
 	 * 发布状态
-	 * 
+	 *
 	 * @return
 	 */
 	@Column(name = "rel_releasestatus")
@@ -337,13 +355,13 @@ public class ReleaseProductByBatch implements Serializable {
 	/**
 	 * 类目名称，便于发布
 	 */
-	@Column(name = "rel_kindname")
+	@Column(name = "rel_b2ckindname")
 	private String kindName;
 
 	/**
 	 * 类目ID
 	 */
-	@Column(name = "rel_kind_uuid")
+	@Column(name = "rel_b2ckindid")
 	private Long kindUuid;
 
 	/**
@@ -809,7 +827,7 @@ public class ReleaseProductByBatch implements Serializable {
 
 	/**
 	 * 价格分段数据
-	 * 
+	 *
 	 * @return
 	 */
 	@Transient
@@ -957,7 +975,7 @@ public class ReleaseProductByBatch implements Serializable {
 
 	/**
 	 * 获取人民币分段报价列表
-	 * 
+	 *
 	 * @return
 	 */
 	@Transient
@@ -980,7 +998,7 @@ public class ReleaseProductByBatch implements Serializable {
 
 	/**
 	 * 获取美元分段报价列表
-	 * 
+	 *
 	 * @return
 	 */
 	@Transient
@@ -1036,6 +1054,33 @@ public class ReleaseProductByBatch implements Serializable {
 		return goods;
 	}
 
+	public String getB2cBrandcn() {
+		return b2cBrandcn;
+	}
+
+	public ReleaseProductByBatch setB2cBrandcn(String b2cBrandcn) {
+		this.b2cBrandcn = b2cBrandcn;
+		return this;
+	}
+
+	public String getB2cBranden() {
+		return b2cBranden;
+	}
+
+	public ReleaseProductByBatch setB2cBranden(String b2cBranden) {
+		this.b2cBranden = b2cBranden;
+		return this;
+	}
+
+	public String getB2cCode() {
+		return b2cCode;
+	}
+
+	public ReleaseProductByBatch setB2cCode(String b2cCode) {
+		this.b2cCode = b2cCode;
+		return this;
+	}
+
 	public String getStoreid() {
 		return storeid;
 	}

src/main/java/com/uas/platform/b2c/prod/product/brand/controller/BrandMapController.java

@@ -28,7 +28,7 @@ import java.util.Map;
  * @author hulh
  */
 @RestController
-@RequestMapping("/product/brandMap")
+@RequestMapping("/produce/brandMap")
 public class BrandMapController {
 
 	@Autowired

src/main/java/com/uas/platform/b2c/prod/product/component/api/ComponentCrawlController.java

@@ -0,0 +1,62 @@
+package com.uas.platform.b2c.prod.product.component.api;
+
+import com.alibaba.fastjson.JSONObject;
+import com.uas.platform.b2c.core.utils.FastjsonUtils;
+import com.uas.platform.b2c.prod.product.component.service.ComponentCrawlService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 用于操作爬虫表
+ *
+ * @version 2017/11/17 16:06 wangyc
+ */
+@RestController("api.ComponentCrawlController")
+@RequestMapping("/api/product/componentCrawl")
+public class ComponentCrawlController {
+
+    @Autowired
+    private ComponentCrawlService componentCrawlService;
+
+    /**
+     * 通过taskid获取下载图片路径
+     * @param taskId
+     * @return
+     */
+    @RequestMapping(value = "/download/img/{taskId}", method = RequestMethod.GET)
+    public List<String> downloadImg(@PathVariable("taskId") String taskId) {
+        return componentCrawlService.downloadImg(taskId);
+    }
+
+    /**
+     * 通过taskid获取下载规格书路径
+     * @param taskId
+     * @return
+     */
+    @RequestMapping(value = "/download/attach/{taskId}", method = RequestMethod.GET)
+    public List<String> downloadAttach(@PathVariable("taskId") String taskId) {
+        return componentCrawlService.downloadAttach(taskId);
+    }
+
+    /**
+     * 上传图片
+     * @param json
+     */
+    @RequestMapping(value = "/upload/img", method = RequestMethod.POST)
+    public String uploadImg(@RequestBody String json) {
+        JSONObject jsonObject = FastjsonUtils.parseObject(json);
+        return componentCrawlService.uploadImg(jsonObject);
+    }
+
+    /**
+     * 上传pdf
+     * @param json
+     */
+    @RequestMapping(value = "/upload/attach", method = RequestMethod.POST)
+    public String uploadAttach(@RequestBody String json) {
+        JSONObject jsonObject = FastjsonUtils.parseObject(json);
+        return componentCrawlService.uploadAttach(jsonObject);
+    }
+}

src/main/java/com/uas/platform/b2c/prod/product/component/dao/ComponentCrawlDao.java

@@ -29,4 +29,20 @@ public interface ComponentCrawlDao extends JpaSpecificationExecutor<ComponentCra
 	 * @return 爬虫库器件
 	 */
 	public List<ComponentCrawl> findByTask(Long task);
+
+	/**
+	 * 通过任务id获取去重后的爬取图片路径
+	 * @param task
+	 * @return
+	 */
+	@Query("select distinct c.img from ComponentCrawl c where c.task = :taskId")
+	public List<String> findImgByTask(@Param("taskId") Long task);
+
+	/**
+	 * 通过任务id获取去重后的爬取图片路径
+	 * @param task
+	 * @return
+	 */
+	@Query("select distinct c.attach from ComponentCrawl c where c.task = :taskId")
+	public List<String> findAttachByTask(@Param("taskId") Long task);
 }

src/main/java/com/uas/platform/b2c/prod/product/component/service/ComponentCrawlService.java

@@ -0,0 +1,40 @@
+package com.uas.platform.b2c.prod.product.component.service;
+
+import com.alibaba.fastjson.JSONObject;
+
+import java.util.List;
+
+/**
+ * Created by wangyc on 2017/11/17.
+ *
+ * @version 2017/11/17 16:08 wangyc
+ */
+public interface ComponentCrawlService {
+
+    /**
+     * 通过任务号下载爬虫表图片地址
+     * @param taskId
+     * @return
+     */
+    List<String> downloadImg(String taskId);
+
+    /**
+     * 通过任务号下载爬虫表规格书地址
+     * @param taskId
+     * @return
+     */
+    List<String> downloadAttach(String taskId);
+
+    /**
+     * 上传更新图片
+     * @param jsonObject
+     */
+    String uploadImg(JSONObject jsonObject);
+
+    /**
+     * 上传更新pdf
+     *
+     * @param jsonObject
+     */
+    String uploadAttach(JSONObject jsonObject);
+}

src/main/java/com/uas/platform/b2c/prod/product/component/service/impl/ComponentCrawlServiceImpl.java

@@ -0,0 +1,77 @@
+package com.uas.platform.b2c.prod.product.component.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.uas.platform.b2c.prod.product.component.dao.ComponentCrawlDao;
+import com.uas.platform.b2c.prod.product.component.dao.ComponentCrawlTaskDao;
+import com.uas.platform.b2c.prod.product.component.modal.ComponentCrawlTask;
+import com.uas.platform.b2c.prod.product.component.service.ComponentCrawlService;
+import com.uas.platform.core.exception.IllegalOperatorException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Created by wangyc on 2017/11/17.
+ *
+ * @version 2017/11/17 16:10 wangyc
+ */
+@Service
+public class ComponentCrawlServiceImpl implements ComponentCrawlService {
+
+    @Autowired
+    private ComponentCrawlTaskDao componentCrawlTaskDao;
+
+    @Autowired
+    private ComponentCrawlDao componentCrawlDao;
+
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+
+    @Override
+    public List<String> downloadImg(String taskId) {
+        ComponentCrawlTask task = componentCrawlTaskDao.findByTaskId(taskId);
+        if (task == null) {
+            throw new IllegalOperatorException("任务不存在");
+        }
+        List<String> imgs = componentCrawlDao.findImgByTask(task.getId());
+        return imgs;
+    }
+
+    @Override
+    public List<String> downloadAttach(String taskId) {
+        ComponentCrawlTask task = componentCrawlTaskDao.findByTaskId(taskId);
+        if (task == null) {
+            throw new IllegalOperatorException("任务不存在");
+        }
+        List<String> attachs = componentCrawlDao.findAttachByTask(task.getId());
+        return attachs;
+    }
+
+    @Override
+    public String uploadImg(JSONObject jsonObject) {
+        String taskId = jsonObject.getString("taskId");
+        String oldUrl = jsonObject.getString("oldUrl");
+        String newUrl = jsonObject.getString("newUrl");
+        ComponentCrawlTask task = componentCrawlTaskDao.findByTaskId(taskId);
+        if (task == null) {
+            throw new IllegalOperatorException("任务不存在");
+        }
+        jdbcTemplate.update("update product$component_crawl set cc_b2c_img = \'" + newUrl + "\' where cc_task = " + task.getId() + " and cc_img = \'" + oldUrl + "' and cc_b2c_img is null" );
+        return "success";
+    }
+
+    @Override
+    public String uploadAttach(JSONObject jsonObject) {
+        String taskId = jsonObject.getString("taskId");
+        String oldUrl = jsonObject.getString("oldUrl");
+        String newUrl = jsonObject.getString("newUrl");
+        ComponentCrawlTask task = componentCrawlTaskDao.findByTaskId(taskId);
+        if (task == null) {
+            throw new IllegalOperatorException("任务不存在");
+        }
+        jdbcTemplate.update("update product$component_crawl set cc_b2c_attach = \'" + newUrl + "\' where cc_task = " + task.getId() + " and cc_attach = \'" + oldUrl + "' and cc_b2c_attach is null" );
+        return "success";
+    }
+}

src/main/java/com/uas/platform/b2c/trade/order/dao/OrderDao.java

@@ -69,13 +69,14 @@ public interface OrderDao extends JpaSpecificationExecutor<Order>, JpaRepository
 	List<Order> findByOrderIds(@Param("orderids") List<String> orderids);
 
 	/**
-	 * 根据某个状态之后的订单
-	 *
-	 * @param status the status
+	 * 查询未评价的订单
 	 * @return  orders
 	 */
-	@Query(nativeQuery = true, value="selcet * from trade$order a where a.or_status >=:status ")
-	List<Order> findByAfterStatus(@Param("status") Integer status);
+	@Query(nativeQuery = true, value=" select o.* from trade$order o " +
+							     	 " left join b2c$rate$vendor v " +
+									 " on o.or_id = v.order_id where locate('405',o.or_statushistory)>0  and v.id is null;")
+	List<Order> findByNotRate();
+
 
 	/**
 	 * Gets count by buyeruu and status.

src/main/java/com/uas/platform/b2c/trade/order/dao/PurchaseDao.java

@@ -29,14 +29,15 @@ public interface PurchaseDao extends JpaSpecificationExecutor<Purchase>, JpaRepo
 	 */
 	List<Purchase> findByStatus(Integer status);
 
+
 	/**
-	 * 根据之后的状态查找采购单
-	 *
-	 * @param status the status
-	 * @return list
+	 * 查询未评价的订单
+	 * @return  orders
 	 */
-	@Query(nativeQuery = true, value = "select * from trade$purchase where pu_status >= :status")
-	List<Purchase> findByAfterStatus(@Param("status") Integer status);
+	@Query(nativeQuery = true, value=" select o.* from trade$purchase o " +
+			" left join b2c$rate$buyer v " +
+			" on o.or_id = v.order_id left join trade$order t on o.or_id = t.or_orderid where locate('405',t.or_statushistory)>0  and v.id is null;")
+	List<Purchase> findByNotRate();
 
 	/**
 	 * 根据状态和企业UU查询采购单

src/main/java/com/uas/platform/b2c/trade/order/service/OrderService.java

@@ -288,13 +288,10 @@ public interface OrderService {
 	List<Order> findByStatus(Integer status);
 
 	/**
-	 * 根据类别查找
-	 *
-	 * @param status the status
-	 * @return list list
-	 * @TODO 查找某个状态之后的订单
+	 * 查找买家未评价的订单
 	 */
-	List<Order> findByAfterStatus(Integer status);
+	List<Order> findByNotRateVendor();
+
 
 	/**
 	 * 通过批次号查询到对应商品

src/main/java/com/uas/platform/b2c/trade/order/service/PurchaseService.java

@@ -140,12 +140,9 @@ public interface PurchaseService {
 	List<Purchase> findByStatus(Integer status);
 
 	/**
-	 * 根据之后的状态查找采购单
-	 *
-	 * @param status the status
-	 * @return list
+	 * 查找买家未评价的订单
 	 */
-	List<Purchase> findByAfterStatus(Integer status);
+	List<Purchase> findByNotRateVendor();
 
 	/**
 	 * 平台管理员获取采购单

src/main/java/com/uas/platform/b2c/trade/order/service/impl/OrderServiceImpl.java

@@ -3,7 +3,6 @@ package com.uas.platform.b2c.trade.order.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.sun.org.apache.xpath.internal.operations.Bool;
 import com.uas.api.b2c_erp.buyer.model.B2cOrder;
 import com.uas.api.exception.B2CException;
 import com.uas.platform.b2c.common.account.dao.EnterpriseDao;
@@ -1533,8 +1532,8 @@ public class OrderServiceImpl implements OrderService {
     }
 
     @Override
-    public List<Order> findByAfterStatus(Integer status) {
-        return orderDao.findByAfterStatus(status);
+    public List<Order> findByNotRateVendor() {
+        return orderDao.findByNotRate();
     }
 
     @Override

src/main/java/com/uas/platform/b2c/trade/order/service/impl/PurchaseServiceImpl.java

@@ -664,8 +664,8 @@ public class PurchaseServiceImpl implements PurchaseService {
 	}
 
 	@Override
-	public List<Purchase> findByAfterStatus(Integer status) {
-		return purchaseDao.findByAfterStatus(status);
+	public List<Purchase> findByNotRateVendor() {
+		return purchaseDao.findByNotRate();
 	}
 
 	@Override

src/main/java/com/uas/platform/b2c/trade/rate/task/RateTask.java

@@ -102,7 +102,7 @@ public class RateTask {
             //先写在代码上，20个工作日自动好评
             automaticReceipt = 20;
 
-            List<Order> orderList = orderService.findByAfterStatus(Status.RECEIVED.value());
+            List<Order> orderList = orderService.findByNotRateVendor();
             String ids = "-";
             for (Order order : orderList) {
                 List<StatusHistory> statusHistories = FastjsonUtils.fromJsonArray(order.getStatushistory(), StatusHistory.class);
@@ -161,7 +161,7 @@ public class RateTask {
             }
 //          //先写在代码上，180个工作日自动追评价
             automaticReceipt = 180;
-            List<Order> orderList = orderService.findByAfterStatus(Status.RECEIVED.value());
+            List<Order> orderList = orderService.findByNotRateVendor();
             String ids = "-";
             for (Order order : orderList) {
                 List<StatusHistory> statusHistories = FastjsonUtils.fromJsonArray(order.getStatushistory(), StatusHistory.class);
@@ -204,7 +204,7 @@ public class RateTask {
     private void autoVendorRate(Integer automaticReceipt,boolean isFirst) {
         try {
             //采购单的自动初评
-            List<Purchase> purchasesList = purchaseService.findByAfterStatus(Status.TOBEPAID.value());
+            List<Purchase> purchasesList = purchaseService.findByNotRateVendor();
             String pids = "-";
             for (Purchase purchase : purchasesList) {
                 List<StatusHistory> statusHistories = FastjsonUtils.fromJsonArray(purchase.getStatushistory(), StatusHistory.class);

src/main/resources/prod/account.properties

@@ -7,7 +7,8 @@ sso.app=mall
 sso.cookie.domain=usoftmall.com
 # token secretkey
 sso.secretkey=0taQcW073Z7G628g5H
-sso.cookie.secure=false
+sso.cookie.secure=true
+sso.cookie.httponly=true
 sso.login.url=https://account.ubtob.com/sso/login
 sso.logout.url=https://account.ubtob.com/sso/logout
 sso.register.url=http://account.ubtob.com/sso/register

src/main/resources/prod/sys.properties

@@ -23,7 +23,7 @@ returnUrl=https://www.usoftmall.com/api/yesreturn
 paymentPrice=prod
 orderProxyUrl=https://www.usoftmall.com/order/proxy
 #report url
-reportPrintUrl=http://print.ubtob.com/report/print?userName=B2C&profile=${profile}&reportName=%s&whereCondition=%s
+reportPrintUrl=https://print.usoftmall.com/print?userName=B2C&profile=${profile}&reportName=%s&whereCondition=%s
 reportUploadUrl=http://print.ubtob.com/report/fileUpload?userName=B2C
 # micro service IP(Swarm Manager IP)
 microServiceIp=10.10.100.23
@@ -31,7 +31,7 @@ newsMicroServiceIp=news.usoftchina.com
 newsRedisRefresh=3600
 floorMicroServiceIp=10.10.0.30
 carouselMicroServiceIp=10.10.0.188
-storecmsMicroServiceIp=10.10.0.30
+storecmsMicroServiceIp=10.10.0.30s
 endpointUri=10.10.100.23
 recommendPort=20100
 # upload file

src/main/webapp/WEB-INF/views/normal/adminWithNav.html

@@ -148,8 +148,8 @@
 			<li class="nav-node"><a href="#audit/bankinfo"><i class="fa fa-bank"></i><span> 银行账户信息</span></a></li>
 			<li class="nav-node"><a href="#audit/realAuth"><i class="glyphicon glyphicon-user"></i><span> 实名认证审核</span></a></li>
 			<li class="nav-header">维护</li>
-			<!--<li class="nav-node"><a href="#/brand/map"><i-->
-					<!--class="fa fa-flag"></i><span> 品牌映射维护</span></a></li>-->
+			<li class="nav-node"><a href="#/brand/map"><i
+					class="fa fa-flag"></i><span> 品牌映射维护</span></a></li>
 			<li class="nav-node"><a href="#/store/company"><i
 					class="fa fa-flag"></i><span> 寄售管理</span></a></li>
 			<li class="nav-node"><a href="#/store/list"><i
@@ -206,6 +206,14 @@
 					class="fa fa-envelope"></i><span> 导航维护</span></a></li>
 			<li class="nav-node"><a href="#help/publish" ><i
 					class="fa fa-envelope"></i><span> 发布</span></a></li>
+
+			<!--<li class="nav-header">推广管理</li>
+			<li class="nav-node"><a href="#help/maintenance" ><i
+					class="fa fa-upload"></i><span> 品牌推广</span></a></li>
+			<li class="nav-node"><a href="#help/publish" ><i
+					class="fa fa-upload"></i><span> 产品推广</span></a></li>
+			<li class="nav-node"><a href="#help/publish" ><i
+					class="fa fa-upload"></i><span> 店铺推广</span></a></li>-->
 		</ul>
 	</div>
 	<!-- main menu end -->

src/main/webapp/resources/js/admin/controllers/product/brandMapCtrl.js

@@ -32,7 +32,7 @@ define(['app/app'], function(app) {
 		};
 
 		var exportByAjax = function () {
-			var url = 'product/brandMap/export';
+			var url = 'produce/brandMap/export';
 			var strArray = [];
 			if ($scope.keyword && $scope.keyword.length > 0){
 				var wordStr = "keyword=" + $scope.keyword;
@@ -71,7 +71,7 @@ define(['app/app'], function(app) {
 		var getDownLoadStatus = function () {
 			Loading.show();
 			$.ajax({
-				url : 'product/brandMap/export',
+				url : 'produce/brandMap/export',
 				data : {isAjax : true},
 				method : 'POST',
 				dataType : 'json',

src/main/webapp/resources/js/common/query/brand.js

@@ -208,14 +208,14 @@ define([ 'ngResource' ], function() {
 		});
 	}]).factory('BrandMap', ['$resource', function ($resource) {
 		//品牌映射关系相关操作
-		return $resource('product/brandMap', {}, {
+		return $resource('produce/brandMap', {}, {
 			//分页获取品牌映射关系
 			getPageOfBrandMap : {
-				url: 'product/brandMap/page',
+				url: 'produce/brandMap/page',
 				method: 'GET'
 			},
 			addOneBrandMap : {
-				url: 'product/brandMap/addOne',
+				url: 'produce/brandMap/addOne',
 				method: 'POST'
 			}
 		});

src/main/webapp/resources/js/usercenter/controllers/forstore/buyer_order_ctrl.js

@@ -361,6 +361,15 @@ define(['app/app'], function (app) {
 			$event.preventDefault();
 			$event.stopPropagation();
 			item[openParam] = !item[openParam];
+			if (openParam == 'startDateOpen'){
+				if (item['endDateOpen']){
+                    item['endDateOpen'] = !item['endDateOpen'];
+				}
+			} else if(openParam == 'endDateOpen'){
+                if (item['startDateOpen']){
+                    item['startDateOpen'] = !item['startDateOpen'];
+                }
+            }
 		};
 
 		// 选择查找日期

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_materialCtrl.js

@@ -192,7 +192,6 @@ define([ 'app/app' ], function(app) {
 					});
 				}
 			}else {
-				$scope.getChoosedInfo();
 				var ids = $scope.choosedIds.join(',');
 				Material.deleteBatch({ids : ids}, function (data) {
 					toaster.pop('success', '删除成功');
@@ -215,6 +214,11 @@ define([ 'app/app' ], function(app) {
 
 		// 批量删除
 		$scope.deleteBatch = function () {
+			$scope.getChoosedInfo();
+			if (!$scope.choosedIds || $scope.choosedIds.length == 0){
+				toaster.pop("info", "请选择要删除的产品");
+				return;
+			}
 			$scope.deleteDiv = true;
 		};
 

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_order_ctrl.js

@@ -758,6 +758,15 @@ define(['app/app'], function (app) {
             $event.preventDefault();
             $event.stopPropagation();
             item[openParam] = !item[openParam];
+            if (openParam == 'startDateOpen'){
+                if (item['endDateOpen']){
+                    item['endDateOpen'] = !item['endDateOpen'];
+                }
+            } else if(openParam == 'endDateOpen'){
+                if (item['startDateOpen']){
+                    item['startDateOpen'] = !item['startDateOpen'];
+                }
+            }
         };
         $scope.changeEndDate = function () {
             if ($scope.condition.endDateOpen) {

src/main/webapp/resources/view/vendor/forstore/vendor_upload.html

@@ -373,9 +373,9 @@
                                         <span ng-bind="$index+1"></span>
                                     </td>
                                     <td style="padding-left: 10px;">
-                                        <div class="text-more">品牌：&nbsp;<em title="{{batchCommodity.brandNameEn || '空'}}" ng-bind="batchCommodity.brandNameEn || '空'"></em></div>
+                                        <div class="text-more">品牌：&nbsp;<em title="{{batchCommodity.b2cBranden || '空'}}" ng-bind="batchCommodity.brandNameEn || '空'"></em></div>
                                         <div class="text-more">类目：&nbsp;<em title="{{batchCommodity.kindName || '空'}}" ng-bind="batchCommodity.kindName || '空'"></em></div>
-                                        <div class="text-more">型号：&nbsp;<em title="{{batchCommodity.code || '空'}}" ng-bind="batchCommodity.code || '空'"></em></div>
+                                        <div class="text-more">型号：&nbsp;<em title="{{batchCommodity.b2cCode || '空'}}" ng-bind="batchCommodity.code || '空'"></em></div>
                                     </td>
                                     <td>
                                         <!--<div>类型：&nbsp;<span ng-bind="batchCommodity.original == 1311 ? '现货' : '呆滞库存' "></span></div>-->