c

src/main/java/com/egolm/shop/controller/CommonController.java

@@ -122,7 +122,7 @@ public class CommonController {
 		Map<String, Object> omap = jdbcTemplate.queryForMap(ossSql.replaceAll("\\s+", " "));
 		Map<String, Object> cmap = jdbcTemplate.queryForMap("select sDesc,sValue1 from tSystemCtrl where sCode = 'ExemptCheck'");
 		List<Map<String, Object>> payTypes = jdbcTemplate.queryForList("select sSalesOrderPayTypeID, sSalesOrderPayType from tOrgPayType where sOrgNO = ? and nTag&1=0", sOrgNO);
-		List<Map<String, Object>> goodsTags = jdbcTemplate.queryForList("select sGoodsTagID, sGoodsTag where sOrgNO = ? and nTag&1 = 0", sOrgNO);
+		List<Map<String, Object>> goodsTags = jdbcTemplate.queryForList("select sGoodsTagID, sGoodsTag from tOrgGoodsTag where sOrgNO = ? and nTag&1 = 0", sOrgNO);
 		return Rjx.jsonOk().set("OrgInfo", map).set("PicInfo", omap).set("ExemptCheck", cmap).set("payTypes", payTypes).set("goodsTags", goodsTags).toJson();
 		
 	}

src/main/java/com/egolm/shop/controller/UserController.java

@@ -205,7 +205,7 @@ public class UserController {
 		}
 		if(customerMap == null) {
 			if(StringUtil.isNotBlank(openId, mobile))  {
-				customerMap = userService.createCustomer(openId, mobile);
+				customerMap = userService.createCustomer(orgNo, openId, mobile);
 			} else {
 				throw new XException("手机号码和OPENID不能为空");
 			}

src/main/java/com/egolm/shop/service/UserService.java

@@ -29,7 +29,7 @@ public interface UserService {
 
 	public Map<String, Object> queryCustomerByMobile(String mobile);
 
-	public Map<String, Object> createCustomer(String openId, String mobile);
+	public Map<String, Object> createCustomer(String orgNo, String openId, String mobile);
 
 	public List<Map<String, Object>> queryShopList(String orgNo, String custNo);
 

src/main/java/com/egolm/shop/service/impl/UserServiceImpl.java

@@ -619,10 +619,10 @@ public class UserServiceImpl implements UserService {
 	}
 
 	@Override
-	public Map<String, Object> createCustomer(String openId, String mobile) {
+	public Map<String, Object> createCustomer(String orgNo, String openId, String mobile) {
 		String sSalesmanNO1 = null;
 		try {
-			sSalesmanNO1 = jdbcTemplate.queryForString("SELECT SalesmanNO = sValue1 FROM tSystemCtrl WHERE sCode = 'DefSalesman'");
+			sSalesmanNO1 = jdbcTemplate.queryForString("select sSalesmanNO from tOrg where sOrgNO = ?", orgNo);
 		} catch (EmptyResultDataAccessException e) {
 			e.printStackTrace();
 		}