diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxProfitSharingReceiver.java b/mallinkService/src/main/java/com/simple/domain/po/WxProfitSharingReceiver.java index 3f7d8463f..38c4749fc 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxProfitSharingReceiver.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxProfitSharingReceiver.java @@ -72,6 +72,18 @@ public class WxProfitSharingReceiver implements Serializable { /***/ @io.swagger.annotations.ApiModelProperty(value="",name="bankCode") private String bankCode; + /*分账接收方状态 0,正常 1,停用**/ + @io.swagger.annotations.ApiModelProperty(value="分账接收方状态 0,正常 1,停用",name="status") + private Integer status; + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + public Long getMerchantId() { return merchantId; } diff --git a/mallinkService/src/main/java/com/simple/enums/EnumProfitSharingReceiverStatus.java b/mallinkService/src/main/java/com/simple/enums/EnumProfitSharingReceiverStatus.java new file mode 100644 index 000000000..9e0fd53f1 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/enums/EnumProfitSharingReceiverStatus.java @@ -0,0 +1,36 @@ +package com.simple.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumProfitSharingReceiverStatus { + PROFIT_SHARING_RECEIVER_STATUS_VALID(0, "正常"), + PROFIT_SHARING_RECEIVER_STATUS_INVALID(1, "停用"), + + ; + + public static EnumProfitSharingReceiverStatus getEnum(Integer code) { + for (EnumProfitSharingReceiverStatus value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumProfitSharingReceiverStatus(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxProfitSharingOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxProfitSharingOrderServiceImpl.java index ded3cc2aa..6347c4534 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxProfitSharingOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxProfitSharingOrderServiceImpl.java @@ -185,6 +185,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ WxProfitSharingReceiver wxProfitSharingReceiver = new WxProfitSharingReceiver(); wxProfitSharingReceiver.setMerchantId(wxOrder.getMerchantId()); wxProfitSharingReceiver.setSharingType(EnumProfitSharingType.PROFIT_SHARING_TYPE_WECHAT.getCode()); + wxProfitSharingReceiver.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_VALID.getCode()); List wxProfitSharingReceiverList = wxProfitSharingReceiverMapper.findList(wxProfitSharingReceiver); if (wxProfitSharingReceiverList.size()<=0 || wxProfitSharingReceiverList.size() > 50) { throw new MallinkException(ErrorCode.PROFIT_SHARING_RECEIVER_INVALID.getCode(), ErrorCode.PROFIT_SHARING_RECEIVER_INVALID.getMessage()); diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxProfitSharingReceiverServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxProfitSharingReceiverServiceImpl.java index 51222c45c..0cb901905 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxProfitSharingReceiverServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxProfitSharingReceiverServiceImpl.java @@ -12,10 +12,7 @@ import com.simple.domain.po.WxAppinfo; import com.simple.domain.po.WxMerchant; import com.simple.domain.po.WxPayAccount; import com.simple.domain.po.WxProfitSharingReceiver; -import com.simple.enums.EnumAppType; -import com.simple.enums.EnumProfitSharingReceiverType; -import com.simple.enums.EnumProfitSharingStatus; -import com.simple.enums.EnumProfitSharingType; +import com.simple.enums.*; import com.simple.mapper.WxAppinfoMapper; import com.simple.mapper.WxPayAccountMapper; import com.simple.mapper.WxProfitSharingReceiverMapper; @@ -97,6 +94,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv receiver.setId(IdWorker.get().nextId()); receiver.setCreateTime(new Date()); receiver.setUpdateTime(new Date()); + receiver.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_VALID.getCode()); //passed from uplevel //receiver.setReceiverAccount(receiverParam.getReceiverAccount()); @@ -157,6 +155,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv receiver.setMerchantId(merchant.getId()); receiver.setSharingType(EnumProfitSharingType.PROFIT_SHARING_TYPE_WECHAT.getCode()); + receiver.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_VALID.getCode()); //receiver.setReceiverAccount(receiverParam.getReceiverAccount()); //receiver.setReceiverType(receiverParam.getReceiverType()); @@ -200,8 +199,8 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv if (!WxPayment.verifyNotifyHMAC(returnMap,payAccount.getApiKey())){ return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED.getCode(), ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED.getMessage()); } - - wxProfitSharingReceiverMapper.deleteByPrimaryKey(receiver); + receiver.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_INVALID.getCode()); + wxProfitSharingReceiverMapper.updateByPrimaryKeySelective(receiver); return new ResultData(returnMap); } diff --git a/mallinkService/src/main/resources/mapper/WxProfitSharingReceiverMapper.xml b/mallinkService/src/main/resources/mapper/WxProfitSharingReceiverMapper.xml index 0039bcac4..349d8ecc0 100644 --- a/mallinkService/src/main/resources/mapper/WxProfitSharingReceiverMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxProfitSharingReceiverMapper.xml @@ -13,10 +13,11 @@ + - `id`,`merchant_id`,`receiver_type`,`receiver_account`,`receiver_comments`,`create_time`,`update_time`,`sharing_type`,`bank_no`,`true_name`,`bank_code` + `id`,`merchant_id`,`receiver_type`,`receiver_account`,`receiver_comments`,`create_time`,`update_time`,`sharing_type`,`bank_no`,`true_name`,`bank_code`,`status` @@ -75,7 +76,13 @@ and `bank_code` like concat('%', #{bankCode},'%') - + + + + and `status` = #{status} + + + and id in