Subversion Repositories SmartDukaan

Rev

Rev 23131 | Rev 23137 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 23131 Rev 23136
Line 27... Line 27...
27
import com.spice.profitmandi.dao.entity.dtr.UserRole;
27
import com.spice.profitmandi.dao.entity.dtr.UserRole;
28
import com.spice.profitmandi.dao.entity.user.Address;
28
import com.spice.profitmandi.dao.entity.user.Address;
29
import com.spice.profitmandi.dao.entity.user.Cart;
29
import com.spice.profitmandi.dao.entity.user.Cart;
30
import com.spice.profitmandi.dao.enumuration.dtr.AccountType;
30
import com.spice.profitmandi.dao.enumuration.dtr.AccountType;
31
import com.spice.profitmandi.dao.enumuration.dtr.RetailerType;
31
import com.spice.profitmandi.dao.enumuration.dtr.RetailerType;
-
 
32
import com.spice.profitmandi.dao.enumuration.dtr.RoleType;
32
import com.spice.profitmandi.dao.repository.dtr.DocumentRepository;
33
import com.spice.profitmandi.dao.repository.dtr.DocumentRepository;
33
import com.spice.profitmandi.dao.repository.dtr.RetailerRegisteredAddressRepository;
34
import com.spice.profitmandi.dao.repository.dtr.RetailerRegisteredAddressRepository;
34
import com.spice.profitmandi.dao.repository.dtr.RetailerRepository;
35
import com.spice.profitmandi.dao.repository.dtr.RetailerRepository;
35
import com.spice.profitmandi.dao.repository.dtr.ShopAddressRepository;
36
import com.spice.profitmandi.dao.repository.dtr.ShopAddressRepository;
36
import com.spice.profitmandi.dao.repository.dtr.ShopRepository;
37
import com.spice.profitmandi.dao.repository.dtr.ShopRepository;
Line 174... Line 175...
174
	private Retailer updateRetailer(User user, Retailer retailer, UpdateRetailerRequest updateRetailerRequest) throws ProfitMandiBusinessException{
175
	private Retailer updateRetailer(User user, Retailer retailer, UpdateRetailerRequest updateRetailerRequest) throws ProfitMandiBusinessException{
175
		if(retailer == null){
176
		if(retailer == null){
176
			int saholicUserId = this.createSaholicUser(user, updateRetailerRequest.getName());
177
			int saholicUserId = this.createSaholicUser(user, updateRetailerRequest.getName());
177
			retailer = new Retailer();
178
			retailer = new Retailer();
178
			retailer.setId(saholicUserId);
179
			retailer.setId(saholicUserId);
-
 
180
			UserRole userRole = new UserRole();
-
 
181
			userRole.setUserId(user.getId());
-
 
182
			userRole.setRoleType(RoleType.RETAILER);
-
 
183
			userRoleRepository.persist(userRole);
179
		}
184
		}
180
		retailer.setName(updateRetailerRequest.getName());
185
		retailer.setName(updateRetailerRequest.getName());
181
		retailer.setNumber(updateRetailerRequest.getNumber());
186
		retailer.setNumber(updateRetailerRequest.getNumber());
182
		if(updateRetailerRequest.getNumber() == null || updateRetailerRequest.getNumber().isEmpty()){
187
		if(updateRetailerRequest.getNumber() == null || updateRetailerRequest.getNumber().isEmpty()){
183
			retailer.setType(RetailerType.UNREGISTERED_SHOP);
188
			retailer.setType(RetailerType.UNREGISTERED_SHOP);