diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java index f78b64b32..893815379 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java @@ -162,14 +162,6 @@ public class WxMerchantBUser implements Serializable { this.status = status; } - public Long getbUserId() { - return bUserId; - } - - public void setbUserId(Long bUserId) { - this.bUserId = bUserId; - } - public String getbUserPwd() { return bUserPwd; } @@ -181,7 +173,6 @@ public class WxMerchantBUser implements Serializable { public static enum Field { Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), TenantId_ASC("`tenant_id` ASC"), TenantId_DESC("`tenant_id` DESC"), - BUserId_ASC("`b_user_id` ASC"), BUserId_DESC("`b_user_id` DESC"), Phone_ASC("`phone` ASC"), Phone_DESC("`phone` DESC"), BUserPwd_ASC("`b_user_pwd` ASC"), BUserPwd_DESC("`b_user_pwd` DESC"), MerchantId_ASC("`merchant_id` ASC"), MerchantId_DESC("`merchant_id` DESC"), diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index d3c65b8f4..db522494f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -185,6 +185,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { @Override public ResultData listCUserVoAsPage(WxCouponOrderCVo record, Integer pageIndex, Integer pageSize) { + return new ResultData(PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfCUser(record))); } @@ -343,7 +344,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } try { wxCouponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); //1核销 - wxCouponOrder.setBUserId(wxMerchantBUser.getbUserId()); + wxCouponOrder.setBUserId(wxMerchantBUser.getId()); wxCouponOrder.setUpdateDate(new Date()); wxCouponOrderMapper.updateByPrimaryKeySelective(wxCouponOrder); } catch (Exception e) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java index 1ccd6b113..b8f7fb319 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java @@ -69,7 +69,6 @@ public class WxMerchantBUserServiceImpl implements WxMerchantBUserService { final IdWorker idWorker = IdWorker.get(); long id = idWorker.nextId(); record.setId(id); - record.setbUserId(id); Date date = new Date(); record.setCreateDate(date); record.setUpdateDate(date); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 086a29189..44b28e307 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -387,7 +387,6 @@ public class WxMerchantServiceImpl implements WxMerchantService { if (user.getId() == null) { long id = idWorker.nextId(); user.setId(id); - user.setbUserId(id); user.setMerchantId(wxMerchant.getId()); user.setTenantId(wxMerchant.getTenantId()); user.setAppId(wxAppinfo.getAppId()); @@ -397,7 +396,6 @@ public class WxMerchantServiceImpl implements WxMerchantService { user.setStatus(EnumMerchantBUserStatus.VALID.getCode()); wxMerchantBUserMapper.insertSelective(user); } else {//有id的更新 - user.setbUserId(user.getId()); user.setMerchantId(wxMerchant.getId()); user.setTenantId(wxMerchant.getTenantId()); user.setAppId(wxAppinfo.getAppId()); diff --git a/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml index 603e233e3..181c3da5b 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml @@ -4,7 +4,6 @@ - @@ -18,7 +17,7 @@ - `id`,`tenant_id`,`b_user_id`,`phone`,`b_user_pwd`,`merchant_id`,`create_date`,`update_date`,`app_id`,`token`,`expire_time`,`name`,`status` + `id`,`tenant_id`,`phone`,`b_user_pwd`,`merchant_id`,`create_date`,`update_date`,`app_id`,`token`,`expire_time`,`name`,`status` @@ -32,12 +31,7 @@ and `tenant_id` = #{tenantId} - - - - and `b_user_id` = #{bUserId} - - + and `phone` = #{phone}