| @@ -149,7 +149,7 @@ public class WxMerchantBUserController extends BaseController { | |||||
| return new ResultData(ErrorCode.MERCHANT_INFO_NOT_VALID); | return new ResultData(ErrorCode.MERCHANT_INFO_NOT_VALID); | ||||
| } | } | ||||
| // check password | // check password | ||||
| if (user1.getBUserPwd().equalsIgnoreCase(password)) { | |||||
| if (user1.getbUserPwd().equalsIgnoreCase(password)) { | |||||
| user1.createToken(currentDate); | user1.createToken(currentDate); | ||||
| token = user1.getToken(); | token = user1.getToken(); | ||||
| resultMap.put("token", token); | resultMap.put("token", token); | ||||
| @@ -89,13 +89,6 @@ public class WxMerchantBUser implements Serializable { | |||||
| tenantId = _tenantId; | tenantId = _tenantId; | ||||
| } | } | ||||
| public Long getBUserId() { | |||||
| return bUserId; | |||||
| } | |||||
| public void setBUserId(Long _bUserId) { | |||||
| bUserId = _bUserId; | |||||
| } | |||||
| public String getPhone() { | public String getPhone() { | ||||
| return phone; | return phone; | ||||
| @@ -105,14 +98,6 @@ public class WxMerchantBUser implements Serializable { | |||||
| phone = _phone; | phone = _phone; | ||||
| } | } | ||||
| public String getBUserPwd() { | |||||
| return bUserPwd; | |||||
| } | |||||
| public void setBUserPwd(String _bUserPwd) { | |||||
| bUserPwd = _bUserPwd; | |||||
| } | |||||
| public Long getMerchantId() { | public Long getMerchantId() { | ||||
| return merchantId; | return merchantId; | ||||
| } | } | ||||
| @@ -38,7 +38,6 @@ import java.io.*; | |||||
| import java.text.ParseException; | import java.text.ParseException; | ||||
| import java.text.SimpleDateFormat; | import java.text.SimpleDateFormat; | ||||
| import java.util.*; | import java.util.*; | ||||
| import java.util.stream.Collectors; | |||||
| @Service | @Service | ||||
| public class WxCouponOrderServiceImpl implements WxCouponOrderService { | public class WxCouponOrderServiceImpl implements WxCouponOrderService { | ||||
| @@ -345,7 +344,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| } | } | ||||
| try { | try { | ||||
| wxCouponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); //1核销 | wxCouponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); //1核销 | ||||
| wxCouponOrder.setBUserId(wxMerchantBUser.getBUserId()); | |||||
| wxCouponOrder.setBUserId(wxMerchantBUser.getbUserId()); | |||||
| wxCouponOrder.setUpdateDate(new Date()); | wxCouponOrder.setUpdateDate(new Date()); | ||||
| wxCouponOrderMapper.updateByPrimaryKeySelective(wxCouponOrder); | wxCouponOrderMapper.updateByPrimaryKeySelective(wxCouponOrder); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| @@ -69,7 +69,7 @@ public class WxMerchantBUserServiceImpl implements WxMerchantBUserService { | |||||
| final IdWorker idWorker = IdWorker.get(); | final IdWorker idWorker = IdWorker.get(); | ||||
| long id = idWorker.nextId(); | long id = idWorker.nextId(); | ||||
| record.setId(id); | record.setId(id); | ||||
| record.setBUserId(id); | |||||
| record.setbUserId(id); | |||||
| Date date = new Date(); | Date date = new Date(); | ||||
| record.setCreateDate(date); | record.setCreateDate(date); | ||||
| record.setUpdateDate(date); | record.setUpdateDate(date); | ||||
| @@ -119,7 +119,7 @@ public class WxMerchantBUserServiceImpl implements WxMerchantBUserService { | |||||
| List<WxMerchantBUser> list = wxMerchantBUserMapper.findList(bUser); | List<WxMerchantBUser> list = wxMerchantBUserMapper.findList(bUser); | ||||
| if (list.size() > 0) { | if (list.size() > 0) { | ||||
| bUser = list.get(0); | bUser = list.get(0); | ||||
| bUser.setBUserPwd(pwd); | |||||
| bUser.setbUserPwd(pwd); | |||||
| try { | try { | ||||
| wxMerchantBUserMapper.updateByPrimaryKeySelective(bUser); | wxMerchantBUserMapper.updateByPrimaryKeySelective(bUser); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| @@ -382,7 +382,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| if (user.getId() == null) { | if (user.getId() == null) { | ||||
| long id = idWorker.nextId(); | long id = idWorker.nextId(); | ||||
| user.setId(id); | user.setId(id); | ||||
| user.setBUserId(id); | |||||
| user.setbUserId(id); | |||||
| user.setMerchantId(wxMerchant.getId()); | user.setMerchantId(wxMerchant.getId()); | ||||
| user.setTenantId(wxMerchant.getTenantId()); | user.setTenantId(wxMerchant.getTenantId()); | ||||
| user.setAppId(wxAppinfo.getAppId()); | user.setAppId(wxAppinfo.getAppId()); | ||||
| @@ -392,7 +392,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| user.setStatus(EnumMerchantBUserStatus.VALID.getCode()); | user.setStatus(EnumMerchantBUserStatus.VALID.getCode()); | ||||
| wxMerchantBUserMapper.insertSelective(user); | wxMerchantBUserMapper.insertSelective(user); | ||||
| } else {//有id的更新 | } else {//有id的更新 | ||||
| user.setBUserId(user.getId()); | |||||
| user.setbUserId(user.getId()); | |||||
| user.setMerchantId(wxMerchant.getId()); | user.setMerchantId(wxMerchant.getId()); | ||||
| user.setTenantId(wxMerchant.getTenantId()); | user.setTenantId(wxMerchant.getTenantId()); | ||||
| user.setAppId(wxAppinfo.getAppId()); | user.setAppId(wxAppinfo.getAppId()); | ||||
| @@ -458,7 +458,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| for (WxMerchantBUser user : bUsers) { | for (WxMerchantBUser user : bUsers) { | ||||
| long id = idWorker.nextId(); | long id = idWorker.nextId(); | ||||
| user.setId(id); | user.setId(id); | ||||
| user.setBUserId(id); | |||||
| user.setbUserId(id); | |||||
| user.setMerchantId(merchantid); | user.setMerchantId(merchantid); | ||||
| user.setTenantId(wxMerchant.getTenantId()); | user.setTenantId(wxMerchant.getTenantId()); | ||||
| user.setAppId(wxAppinfo.getAppId()); | user.setAppId(wxAppinfo.getAppId()); | ||||
| @@ -558,7 +558,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| if (user.getId() == null) {//没有id的新增 | if (user.getId() == null) {//没有id的新增 | ||||
| long id = idWorker.nextId(); | long id = idWorker.nextId(); | ||||
| user.setId(id); | user.setId(id); | ||||
| user.setBUserId(id); | |||||
| user.setbUserId(id); | |||||
| user.setMerchantId(wxMerchant.getId()); | user.setMerchantId(wxMerchant.getId()); | ||||
| user.setTenantId(wxMerchant.getTenantId()); | user.setTenantId(wxMerchant.getTenantId()); | ||||
| user.setAppId(wxAppinfo.getAppId()); | user.setAppId(wxAppinfo.getAppId()); | ||||
| @@ -568,7 +568,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| user.setStatus(EnumMerchantBUserStatus.VALID.getCode()); | user.setStatus(EnumMerchantBUserStatus.VALID.getCode()); | ||||
| wxMerchantBUserMapper.insertSelective(user); | wxMerchantBUserMapper.insertSelective(user); | ||||
| } else {//有id的更新 | } else {//有id的更新 | ||||
| user.setBUserId(user.getId()); | |||||
| user.setbUserId(user.getId()); | |||||
| user.setMerchantId(wxMerchant.getId()); | user.setMerchantId(wxMerchant.getId()); | ||||
| user.setTenantId(wxMerchant.getTenantId()); | user.setTenantId(wxMerchant.getTenantId()); | ||||
| user.setAppId(wxAppinfo.getAppId()); | user.setAppId(wxAppinfo.getAppId()); | ||||