| @@ -68,15 +68,6 @@ public class WxMerchant implements Serializable { | |||
| /*联系方式**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="联系方式",name="linkPhone") | |||
| private String linkPhone; | |||
| /*银行卡**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="银行卡",name="bankCard") | |||
| private String bankCard; | |||
| /*银行开户行**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="银行开户行",name="bankName") | |||
| private String bankName; | |||
| /*支付ID,参看wx_pay_account**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="收款帐户",name="receiver_account") | |||
| private Long receiverAccount; | |||
| /*创建时间**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | |||
| private Date createDate; | |||
| @@ -121,26 +112,6 @@ public class WxMerchant implements Serializable { | |||
| public void setLinkPhone(String _linkPhone) { | |||
| linkPhone = _linkPhone; | |||
| } | |||
| public String getBankCard() { | |||
| return bankCard; | |||
| } | |||
| public void setBankCard(String _bankCard) { | |||
| bankCard = _bankCard; | |||
| } | |||
| public String getBankName() { | |||
| return bankName; | |||
| } | |||
| public void setBankName(String _bankName) { | |||
| bankName = _bankName; | |||
| } | |||
| public Long getReceiverAccount() { | |||
| return receiverAccount; | |||
| } | |||
| public void setReceiverAccount(Long receiverAccount) { | |||
| this.receiverAccount = receiverAccount; | |||
| } | |||
| public Date getCreateDate() { | |||
| return createDate; | |||
| @@ -238,9 +209,6 @@ public class WxMerchant implements Serializable { | |||
| ,ImgUrl_ASC("`img_url` ASC"),ImgUrl_DESC("`img_url` DESC") | |||
| ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") | |||
| ,LinkPhone_ASC("`link_phone` ASC"),LinkPhone_DESC("`link_phone` DESC") | |||
| ,BankCard_ASC("`bank_card` ASC"),BankCard_DESC("`bank_card` DESC") | |||
| ,BankName_ASC("`bank_name` ASC"),BankName_DESC("`bank_name` DESC") | |||
| ,PayId_ASC("`pay_id` ASC"),PayId_DESC("`pay_id` DESC") | |||
| ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") | |||
| ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") | |||
| ,CarVendorType_ASC("`car_vendor_type` ASC"),CarVendorType_DESC("`car_vendor_type` DESC") | |||
| @@ -33,12 +33,12 @@ public interface WxMerchantService { | |||
| */ | |||
| WxMerchant getById(Long id); | |||
| /** | |||
| /** | |||
| * 保存或更新实体 | |||
| * | |||
| * @param record | |||
| */ | |||
| void saveOrUpdate(WxMerchant record); | |||
| void saveOrUpdate(WxMerchant record); | |||
| /** | |||
| * 根据Id删除实体 | |||
| @@ -246,8 +246,6 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ | |||
| wxProfitSharingResultMapper.insertList(resultList); | |||
| return new ResultData(returnMap); | |||
| } catch (RuntimeException e) { | |||
| throw new MallinkException(ErrorCode.PAY_ORDER_ERROR.getCode(), e.getMessage()); | |||
| } catch (Exception e) { | |||
| throw new MallinkException(ErrorCode.PAY_ORDER_ERROR.getCode(), e.getMessage()); | |||
| } | |||
| @@ -101,7 +101,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv | |||
| receiver.setId(IdWorker.get().nextId()); | |||
| receiver.setCreateTime(new Date()); | |||
| receiver.setUpdateTime(new Date()); | |||
| receiver.setReceiverAccount(merchant.getReceiverAccount().toString()); | |||
| //receiver.setReceiverAccount(merchant.getReceiverAccount().toString()); | |||
| receiver.setReceiverComments(merchant.getName()); | |||
| receiver.setReceiverType(EnumProfitSharingReceiverType.PROFIT_SHARING_RECEIVER_MERCHANT_ID.getCode()); | |||
| receiver.setTrueName(merchant.getName()); | |||
| @@ -119,7 +119,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv | |||
| JSONObject receiverJSON = new JSONObject(); | |||
| receiverJSON.put("type",EnumProfitSharingReceiverType.PROFIT_SHARING_RECEIVER_MERCHANT_ID.getMessage()); | |||
| receiverJSON.put("account",merchant.getReceiverAccount()); | |||
| //receiverJSON.put("account",merchant.getReceiverAccount()); | |||
| receiverJSON.put("name",merchant.getName()); | |||
| wxProfitSharingReceiverP.setReceiver(receiverJSON.toJSONString()); | |||
| @@ -164,7 +164,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv | |||
| WxProfitSharingReceiver receiver = new WxProfitSharingReceiver(); | |||
| receiver.setMerchantId(merchant.getId().toString()); | |||
| receiver.setSharingType(EnumProfitSharingType.PROFIT_SHARING_TYPE_WECHAT.getCode()); | |||
| receiver.setReceiverAccount(merchant.getReceiverAccount().toString()); | |||
| //receiver.setReceiverAccount(merchant.getReceiverAccount().toString()); | |||
| receiver.setReceiverType(EnumProfitSharingReceiverType.PROFIT_SHARING_RECEIVER_MERCHANT_ID.getCode()); | |||
| receiver = wxProfitSharingReceiverMapper.selectOne(receiver); | |||
| @@ -185,7 +185,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv | |||
| JSONObject receiverJSON = new JSONObject(); | |||
| receiverJSON.put("type",EnumProfitSharingReceiverType.PROFIT_SHARING_RECEIVER_MERCHANT_ID.getMessage()); | |||
| receiverJSON.put("account",merchant.getReceiverAccount()); | |||
| //receiverJSON.put("account",merchant.getReceiverAccount()); | |||
| wxProfitSharingReceiverP.setReceiver(receiverJSON.toJSONString()); | |||
| String response; | |||
| @@ -7,9 +7,6 @@ | |||
| <result column="img_url" jdbcType="VARCHAR" property="imgUrl" /> | |||
| <result column="name" jdbcType="VARCHAR" property="name" /> | |||
| <result column="link_phone" jdbcType="VARCHAR" property="linkPhone" /> | |||
| <result column="bank_card" jdbcType="VARCHAR" property="bankCard" /> | |||
| <result column="bank_name" jdbcType="VARCHAR" property="bankName" /> | |||
| <result column="receiver_account" jdbcType="BIGINT" property="receiverAccount" /> | |||
| <result column="create_date" jdbcType="TIMESTAMP" property="createDate" /> | |||
| <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" /> | |||
| <result column="car_vendor_type" jdbcType="INTEGER" property="carVendorType" /> | |||
| @@ -49,22 +46,7 @@ | |||
| <if test=" null != linkPhone "> | |||
| and `link_phone` like concat('%', #{linkPhone},'%') | |||
| </if> | |||
| <if test=" null != bankCard "> | |||
| and `bank_card` like concat('%', #{bankCard},'%') | |||
| </if> | |||
| <if test=" null != bankName "> | |||
| and `bank_name` like concat('%', #{bankName},'%') | |||
| </if> | |||
| <if test=" null != receiverAccount "> | |||
| and `receiver_account` = #{receiverAccount} | |||
| </if> | |||
| </if> | |||
| <if test=" null != createDate "> | |||
| and `create_date` = #{createDate} | |||