Merge remote-tracking branch 'origin/feature/yc-mysql_erp-1020' into feature/yc-mysql_erp-1020

src/main/java/com/uas/platform/b2c/external/erp/prod/service/impl/ProdServiceImpl.java

@@ -9,6 +9,8 @@ import com.uas.platform.b2c.external.erp.product.util.ModelConverter;
 import com.uas.platform.b2c.prod.commodity.dao.ProductDao;
 import com.uas.platform.b2c.prod.commodity.model.Product;
 import com.uas.platform.b2c.prod.commodity.service.ProductService;
+import com.uas.platform.b2c.prod.store.dao.StoreInDao;
+import com.uas.platform.b2c.prod.store.model.StoreIn;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +33,9 @@ public class ProdServiceImpl implements ProdService {
     @Autowired
     private ProductService productService;
 
+    @Autowired
+    private StoreInDao storeInDao;
+
     private static final ErpB2cBufferedLogger logger = BufferedLoggerManager.getLogger(ErpB2cBufferedLogger.class);
 
     // TODO
@@ -93,4 +98,14 @@ public class ProdServiceImpl implements ProdService {
         logger.log("物料资料", "ERP回调修改物料资料下载状态,企业：" + SystemSession.getUser().getEnterprise().getEnName());
         productDao.save(products);
     }
+
+    @Override
+    public String returnStoreUrl() {
+        String url = "";
+        List<StoreIn> storeIn = storeInDao.findByEnUU(SystemSession.getUser().getEnterprise().getUu());
+        if (!CollectionUtils.isEmpty(storeIn)) {
+            return url = "/store/" + storeIn.get(0).getUuid();
+        }
+        return url;
+    }
 }

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductServiceImpl.java

@@ -704,6 +704,8 @@ public class ProductServiceImpl implements ProductService {
         productDetail.setMinPackQty(goods.getMinPackQty());
         productDetail.setPackaging(goods.getPackaging());
 
+        if (enterpriseService.getCurrencyByRegisterAddress().getData() == null)
+            throw new IllegalOperatorException("注册地址为空，无法确认币别信息，请前往-优软云补充注册地址信息");
         String currency = enterpriseService.getCurrencyByRegisterAddress().getData().toString();
         List<GoodsQtyPrice> qtyPrice = FastjsonUtils.fromJsonArray(goods.getQtyPrice(), GoodsQtyPrice.class);
         if (!CollectionUtils.isEmpty(qtyPrice)) {