| @@ -162,14 +162,6 @@ public class WxMerchantBUser implements Serializable { | |||||
| this.status = status; | this.status = status; | ||||
| } | } | ||||
| public Long getbUserId() { | |||||
| return bUserId; | |||||
| } | |||||
| public void setbUserId(Long bUserId) { | |||||
| this.bUserId = bUserId; | |||||
| } | |||||
| public String getbUserPwd() { | public String getbUserPwd() { | ||||
| return bUserPwd; | return bUserPwd; | ||||
| } | } | ||||
| @@ -181,7 +173,6 @@ public class WxMerchantBUser implements Serializable { | |||||
| public static enum Field { | public static enum Field { | ||||
| Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), | Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), | ||||
| TenantId_ASC("`tenant_id` ASC"), TenantId_DESC("`tenant_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"), | Phone_ASC("`phone` ASC"), Phone_DESC("`phone` DESC"), | ||||
| BUserPwd_ASC("`b_user_pwd` ASC"), BUserPwd_DESC("`b_user_pwd` DESC"), | BUserPwd_ASC("`b_user_pwd` ASC"), BUserPwd_DESC("`b_user_pwd` DESC"), | ||||
| MerchantId_ASC("`merchant_id` ASC"), MerchantId_DESC("`merchant_id` DESC"), | MerchantId_ASC("`merchant_id` ASC"), MerchantId_DESC("`merchant_id` DESC"), | ||||
| @@ -185,6 +185,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| @Override | @Override | ||||
| public ResultData listCUserVoAsPage(WxCouponOrderCVo record, Integer pageIndex, Integer pageSize) { | public ResultData listCUserVoAsPage(WxCouponOrderCVo record, Integer pageIndex, Integer pageSize) { | ||||
| return new ResultData(PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfCUser(record))); | return new ResultData(PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfCUser(record))); | ||||
| } | } | ||||
| @@ -343,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.getId()); | |||||
| wxCouponOrder.setUpdateDate(new Date()); | wxCouponOrder.setUpdateDate(new Date()); | ||||
| wxCouponOrderMapper.updateByPrimaryKeySelective(wxCouponOrder); | wxCouponOrderMapper.updateByPrimaryKeySelective(wxCouponOrder); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| @@ -69,7 +69,6 @@ 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); | |||||
| Date date = new Date(); | Date date = new Date(); | ||||
| record.setCreateDate(date); | record.setCreateDate(date); | ||||
| record.setUpdateDate(date); | record.setUpdateDate(date); | ||||
| @@ -387,7 +387,6 @@ 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.setMerchantId(wxMerchant.getId()); | user.setMerchantId(wxMerchant.getId()); | ||||
| user.setTenantId(wxMerchant.getTenantId()); | user.setTenantId(wxMerchant.getTenantId()); | ||||
| user.setAppId(wxAppinfo.getAppId()); | user.setAppId(wxAppinfo.getAppId()); | ||||
| @@ -397,7 +396,6 @@ 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.setMerchantId(wxMerchant.getId()); | user.setMerchantId(wxMerchant.getId()); | ||||
| user.setTenantId(wxMerchant.getTenantId()); | user.setTenantId(wxMerchant.getTenantId()); | ||||
| user.setAppId(wxAppinfo.getAppId()); | user.setAppId(wxAppinfo.getAppId()); | ||||
| @@ -4,7 +4,6 @@ | |||||
| <resultMap id="BaseResultMap" type="com.iformall.domain.po.WxMerchantBUser"> | <resultMap id="BaseResultMap" type="com.iformall.domain.po.WxMerchantBUser"> | ||||
| <id column="id" jdbcType="BIGINT" property="id" /> | <id column="id" jdbcType="BIGINT" property="id" /> | ||||
| <result column="tenant_id" jdbcType="VARCHAR" property="tenantId" /> | <result column="tenant_id" jdbcType="VARCHAR" property="tenantId" /> | ||||
| <result column="b_user_id" jdbcType="BIGINT" property="bUserId" /> | |||||
| <result column="phone" jdbcType="VARCHAR" property="phone" /> | <result column="phone" jdbcType="VARCHAR" property="phone" /> | ||||
| <result column="b_user_pwd" jdbcType="VARCHAR" property="bUserPwd" /> | <result column="b_user_pwd" jdbcType="VARCHAR" property="bUserPwd" /> | ||||
| <result column="merchant_id" jdbcType="BIGINT" property="merchantId" /> | <result column="merchant_id" jdbcType="BIGINT" property="merchantId" /> | ||||
| @@ -18,7 +17,7 @@ | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `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` | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| @@ -32,12 +31,7 @@ | |||||
| <if test=" null != tenantId "> | <if test=" null != tenantId "> | ||||
| and `tenant_id` = #{tenantId} | and `tenant_id` = #{tenantId} | ||||
| </if> | |||||
| <if test=" null != bUserId "> | |||||
| and `b_user_id` = #{bUserId} | |||||
| </if> | |||||
| </if> | |||||
| <if test=" null != phone "> | <if test=" null != phone "> | ||||
| and `phone` = #{phone} | and `phone` = #{phone} | ||||