Merge branch 'master' of http://key@gitlab.egolm.com/key/shop.git

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

-package com.egolm.shop.service;
-
-import java.util.List;
-import java.util.Map;
-
-import com.egolm.shop.pojo.TCustomer;
-import com.egolm.shop.pojo.TShop;
-
-public interface UserService {
-	public TCustomer getCustomer(String custNO,String shopNO);
-	
-	public TCustomer getCustomer(String mobile);
-	
-	public TShop getShop(String shopNO);
-	
-	public Map<String,Object> createGuest(Map<String,Object> params);
-	
-	public String login(Map<String,Object> params) ;
-	
-	public String modifyPwd(Map<String,Object> params);
-	
-	public String sendSms(Map<String,Object> params);
-	
-	public boolean checkShopExists(String custNO,String shopNO);
-
-	public String modifyShopAuthInfo(Map<String, Object> parameters);
-
-	public Map<String, Object> queryCustomerByOpenId(String openId);
-
-	public Map<String, Object> queryCustomerByMobile(String mobile);
-
-	public Map<String, Object> createCustomer(String orgNo, String openId, String mobile);
-
-	public List<Map<String, Object>> queryShopList(String orgNo, String custNo);
-
-	public Map<String, Object> createShop(String orgNo, Map<String, Object> customerMap);
-
-	public void deleteOpenId(String openId);
-
-	public void saveOpenId(String string, String openId);
-
-	public String queryShopAuthInfo(String shopNo, String langID);
-
-	public Map<String, Object> getSalesmanByShopNo(String shopNo);
-
-	public Map<String, Object> getCustomerByNO(String custNo);
-
-	public void updateCustomerEmail(String custNo, String email);
-
-	public List<Map<String, Object>> queryBankList(String sCustNO);
-
-	public Map<String, Object> loginByOpenId(String orgNo, String openId, String mobile, String name);
-
-}
+package com.egolm.shop.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.egolm.shop.pojo.TCustomer;
+import com.egolm.shop.pojo.TShop;
+
+public interface UserService {
+	public TCustomer getCustomer(String custNO,String shopNO);
+	
+	public TCustomer getCustomer(String mobile);
+	
+	public TShop getShop(String shopNO);
+	
+	public Map<String,Object> createGuest(Map<String,Object> params);
+	
+	public String login(Map<String,Object> params) ;
+	
+	public String modifyPwd(Map<String,Object> params);
+	
+	public String sendSms(Map<String,Object> params);
+	
+	public boolean checkShopExists(String custNO,String shopNO);
+
+	public String modifyShopAuthInfo(Map<String, Object> parameters);
+
+	public Map<String, Object> queryCustomerByOpenId(String openId);
+
+	public Map<String, Object> queryCustomerByMobile(String mobile);
+
+	public Map<String, Object> createCustomer(String orgNo, String openId, String mobile);
+
+	public List<Map<String, Object>> queryShopList(String orgNo, String custNo);
+
+	public Map<String, Object> createShop(String orgNo, Map<String, Object> customerMap);
+
+	public void deleteOpenId(String openId);
+
+	public void saveOpenId(String string, String openId);
+
+	public String queryShopAuthInfo(String shopNo, String langID);
+
+	public Map<String, Object> getSalesmanByShopNo(String shopNo);
+
+	public Map<String, Object> getCustomerByNO(String custNo);
+
+	public void updateCustomerEmail(String custNo, String email);
+
+	public List<Map<String, Object>> queryBankList(String sCustNO);
+
+	public Map<String, Object> loginByOpenId(String orgNo, String openId, String mobile, String name);
+	
+	public void updateB2BUnionID(String UserNO, String UnionID);
+
+}

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

@@ -847,4 +847,10 @@ public class UserServiceImpl implements UserService {
 		}
 		return new XException((String)errorMsg);
 	}
+	
+	
+	@Override
+	public void updateB2BUnionID(String UserNO, String UnionID) {
+		jdbcTemplate.update("update tB2BUser set  sUnionID = ? ,dLastUpdateTime = getdate()  where sUserNO = ?", UnionID, UserNO);
+	}
 }
\ No newline at end of file