| @@ -68,8 +68,8 @@ public class WxMerchant implements Serializable { | |||||
| @io.swagger.annotations.ApiModelProperty(value="银行开户行",name="bankName") | @io.swagger.annotations.ApiModelProperty(value="银行开户行",name="bankName") | ||||
| private String bankName; | private String bankName; | ||||
| /*支付ID,参看wx_pay_account**/ | /*支付ID,参看wx_pay_account**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="支付ID,参看wx_pay_account",name="payId") | |||||
| private Long payId; | |||||
| @io.swagger.annotations.ApiModelProperty(value="收款帐户",name="receiver_account") | |||||
| private Long receiverAccount; | |||||
| /*创建时间**/ | /*创建时间**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| @@ -122,12 +122,15 @@ public class WxMerchant implements Serializable { | |||||
| public void setBankName(String _bankName) { | public void setBankName(String _bankName) { | ||||
| bankName = _bankName; | bankName = _bankName; | ||||
| } | } | ||||
| public Long getPayId() { | |||||
| return payId; | |||||
| public Long getReceiverAccount() { | |||||
| return receiverAccount; | |||||
| } | } | ||||
| public void setPayId(Long _payId) { | |||||
| payId = _payId; | |||||
| public void setReceiverAccount(Long receiverAccount) { | |||||
| this.receiverAccount = receiverAccount; | |||||
| } | } | ||||
| public Date getCreateDate() { | public Date getCreateDate() { | ||||
| return createDate; | return createDate; | ||||
| } | } | ||||
| @@ -90,9 +90,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| wxAppinfo = wxAppinfoMapper.findList(wxAppinfo).get(0); | wxAppinfo = wxAppinfoMapper.findList(wxAppinfo).get(0); | ||||
| final IdWorker idWorker = IdWorker.get(); | final IdWorker idWorker = IdWorker.get(); | ||||
| long merchantid = idWorker.nextId(); | |||||
| if (wxMerchant.getId() == null) { | |||||
| if (wxMerchant.getId() == null) { | |||||
| long merchantid = idWorker.nextId(); | |||||
| wxMerchant.setId(merchantid); | wxMerchant.setId(merchantid); | ||||
| Date date = new Date(); | Date date = new Date(); | ||||
| wxMerchant.setStatus(1); | wxMerchant.setStatus(1); | ||||
| @@ -122,6 +122,28 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| WxShopMapper.updateByPrimaryKeySelective(wxShop); | WxShopMapper.updateByPrimaryKeySelective(wxShop); | ||||
| } | } | ||||
| //删除之前的关联用户 | |||||
| List<WxMerchantBUser> bUsers = wxMerchant.getbUsers(); | |||||
| for(WxMerchantBUser user:bUsers){ | |||||
| wxMerchantBUserMapper.deleteByPrimaryKey(user.getId()); | |||||
| } | |||||
| //保存商户关联用户 | |||||
| for(WxMerchantBUser user:bUsers){ | |||||
| long id = idWorker.nextId(); | |||||
| user.setId(id); | |||||
| user.setBUserId(id); | |||||
| user.setMerchantId(merchantid); | |||||
| user.setTenantId(wxMerchant.getTenantId()); | |||||
| user.setAppId(wxAppinfo.getAppId()); | |||||
| date = new Date(); | |||||
| user.setCreateDate(date); | |||||
| user.setUpdateDate(date); | |||||
| wxMerchantBUserMapper.insertSelective(user); | |||||
| } | |||||
| } else { | } else { | ||||
| //更新商户 | //更新商户 | ||||
| @@ -166,30 +188,27 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| WxShopMapper.updateByPrimaryKeySelective(wxShop); | WxShopMapper.updateByPrimaryKeySelective(wxShop); | ||||
| } | } | ||||
| } | |||||
| //删除之前的关联用户 | |||||
| List<WxMerchantBUser> bUsers = wxMerchant.getbUsers(); | |||||
| //删除之前的关联用户 | |||||
| List<WxMerchantBUser> bUsers = wxMerchant.getbUsers(); | |||||
| for(WxMerchantBUser user:bUsers){ | |||||
| wxMerchantBUserMapper.deleteByPrimaryKey(user.getId()); | |||||
| } | |||||
| for(WxMerchantBUser user:bUsers){ | |||||
| wxMerchantBUserMapper.deleteByPrimaryKey(user.getId()); | |||||
| } | |||||
| //保存商户关联用户 | |||||
| for(WxMerchantBUser user:bUsers){ | |||||
| long id = idWorker.nextId(); | |||||
| user.setId(id); | |||||
| user.setBUserId(id); | |||||
| user.setMerchantId(wxMerchant.getId()); | |||||
| user.setTenantId(wxMerchant.getTenantId()); | |||||
| user.setAppId(wxAppinfo.getAppId()); | |||||
| date = new Date(); | |||||
| user.setCreateDate(date); | |||||
| user.setUpdateDate(date); | |||||
| wxMerchantBUserMapper.insertSelective(user); | |||||
| //保存商户关联用户 | |||||
| for(WxMerchantBUser user:bUsers){ | |||||
| long id = idWorker.nextId(); | |||||
| user.setId(id); | |||||
| user.setBUserId(id); | |||||
| user.setMerchantId(merchantid); | |||||
| user.setTenantId(wxMerchant.getTenantId()); | |||||
| user.setAppId(wxAppinfo.getAppId()); | |||||
| Date date = new Date(); | |||||
| user.setCreateDate(date); | |||||
| user.setUpdateDate(date); | |||||
| wxMerchantBUserMapper.insertSelective(user); | |||||
| } | |||||
| } | } | ||||
| @@ -9,7 +9,7 @@ | |||||
| <result column="link_phone" jdbcType="VARCHAR" property="linkPhone" /> | <result column="link_phone" jdbcType="VARCHAR" property="linkPhone" /> | ||||
| <result column="bank_card" jdbcType="VARCHAR" property="bankCard" /> | <result column="bank_card" jdbcType="VARCHAR" property="bankCard" /> | ||||
| <result column="bank_name" jdbcType="VARCHAR" property="bankName" /> | <result column="bank_name" jdbcType="VARCHAR" property="bankName" /> | ||||
| <result column="pay_id" jdbcType="BIGINT" property="payId" /> | |||||
| <result column="receiver_account" jdbcType="BIGINT" property="receiverAccount" /> | |||||
| <result column="create_date" jdbcType="TIMESTAMP" property="createDate" /> | <result column="create_date" jdbcType="TIMESTAMP" property="createDate" /> | ||||
| <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" /> | <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" /> | ||||
| <result column="car_vendor_type" jdbcType="INTEGER" property="carVendorType" /> | <result column="car_vendor_type" jdbcType="INTEGER" property="carVendorType" /> | ||||
| @@ -19,7 +19,7 @@ | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`tenant_id`,`img_url`,`name`,`link_phone`,`bank_card`,`bank_name`,`pay_id`,`create_date`,`update_date`,`car_vendor_type`,`car_params`,`status` | |||||
| `id`,`tenant_id`,`img_url`,`name`,`link_phone`,`bank_card`,`bank_name`,`receiver_account`,`create_date`,`update_date`,`car_vendor_type`,`car_params`,`status` | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| @@ -60,8 +60,8 @@ | |||||
| </if> | </if> | ||||
| <if test=" null != payId "> | |||||
| and `pay_id` = #{payId} | |||||
| <if test=" null != receiverAccount "> | |||||
| and `receiver_account` = #{receiverAccount} | |||||
| </if> | </if> | ||||