Browse Source

[商户商铺][商户管理][修改常量值]

release_toaliyun_real
gongbiao 7 years ago
parent
commit
79267827db
6 changed files with 169 additions and 25 deletions
  1. +38
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumBillRentPayWay.java
  2. +36
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumBillRentStatus.java
  3. +36
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumDelStatus.java
  4. +36
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumMerchantBUserStatus.java
  5. +22
    -24
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
  6. +1
    -1
      mallinkService/src/main/resources/mapper/WxMerchantMapper.xml

+ 38
- 0
mallinkService/src/main/java/com/iformall/enums/EnumBillRentPayWay.java View File

@@ -0,0 +1,38 @@
package com.iformall.enums;

/**
* Created by Stormeye on 2018/08/09.
*/
public enum EnumBillRentPayWay {

WEIXIN(1, "微信"),
ALIPAY(2, "支付宝"),
BANK(3,"银行"),
CASH(4,"现金")
;

public static EnumBillRentPayWay getEnum(Integer code) {
for (EnumBillRentPayWay value : values()) {
if (value.getCode().equals(code)) {
return value;
}
}
return null;
}

private Integer code;
private String message;

EnumBillRentPayWay(Integer code, String message) {
this.code = code;
this.message = message;
}

public Integer getCode() {
return code;
}

public String getMessage() {
return message;
}
}

+ 36
- 0
mallinkService/src/main/java/com/iformall/enums/EnumBillRentStatus.java View File

@@ -0,0 +1,36 @@
package com.iformall.enums;

/**
* Created by Stormeye on 2018/08/09.
*/
public enum EnumBillRentStatus {

NOT_PAID(0, "已结清"),
PAID(1, "未结清"),
;

public static EnumBillRentStatus getEnum(Integer code) {
for (EnumBillRentStatus value : values()) {
if (value.getCode().equals(code)) {
return value;
}
}
return null;
}

private Integer code;
private String message;

EnumBillRentStatus(Integer code, String message) {
this.code = code;
this.message = message;
}

public Integer getCode() {
return code;
}

public String getMessage() {
return message;
}
}

+ 36
- 0
mallinkService/src/main/java/com/iformall/enums/EnumDelStatus.java View File

@@ -0,0 +1,36 @@
package com.iformall.enums;

/**
* Created by Stormeye on 2018/08/09.
*/
public enum EnumDelStatus {

NOT_DEL(0, "未删除"),
DEL(1, "已删除"),
;

public static EnumDelStatus getEnum(Integer code) {
for (EnumDelStatus value : values()) {
if (value.getCode().equals(code)) {
return value;
}
}
return null;
}

private Integer code;
private String message;

EnumDelStatus(Integer code, String message) {
this.code = code;
this.message = message;
}

public Integer getCode() {
return code;
}

public String getMessage() {
return message;
}
}

+ 36
- 0
mallinkService/src/main/java/com/iformall/enums/EnumMerchantBUserStatus.java View File

@@ -0,0 +1,36 @@
package com.iformall.enums;

/**
* Created by Stormeye on 2018/08/09.
*/
public enum EnumMerchantBUserStatus {

NOT_BOUND(0, "绑定"),
BOUND(1, "未绑定"),
;

public static EnumMerchantBUserStatus getEnum(Integer code) {
for (EnumMerchantBUserStatus value : values()) {
if (value.getCode().equals(code)) {
return value;
}
}
return null;
}

private Integer code;
private String message;

EnumMerchantBUserStatus(Integer code, String message) {
this.code = code;
this.message = message;
}

public Integer getCode() {
return code;
}

public String getMessage() {
return message;
}
}

+ 22
- 24
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java View File

@@ -4,9 +4,7 @@ import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;
import com.iformall.domain.po.*; import com.iformall.domain.po.*;
import com.iformall.enums.EnumAppType;
import com.iformall.enums.EnumCarVendor;
import com.iformall.enums.EnumShopStatus;
import com.iformall.enums.*;
import com.iformall.mapper.*; import com.iformall.mapper.*;
import com.iformall.service.WxMerchantService; import com.iformall.service.WxMerchantService;
import com.iformall.service.WxProfitSharingReceiverService; import com.iformall.service.WxProfitSharingReceiverService;
@@ -49,7 +47,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {


WxMerchantShop merchantShop = new WxMerchantShop(); WxMerchantShop merchantShop = new WxMerchantShop();
merchantShop.setTenantId(record.getTenantId()); merchantShop.setTenantId(record.getTenantId());
merchantShop.setIsDel(0);
merchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode());
List<WxMerchantShop> merchantShops = wxMerchantShopMapper.findList(merchantShop); List<WxMerchantShop> merchantShops = wxMerchantShopMapper.findList(merchantShop);


PageHelper.startPage(pageIndex, pageSize); PageHelper.startPage(pageIndex, pageSize);
@@ -76,7 +74,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
WxMerchant wxMerchant = wxMerchantMapper.selectByPrimaryKey(id); WxMerchant wxMerchant = wxMerchantMapper.selectByPrimaryKey(id);
WxMerchantShop wxMerchantShop=new WxMerchantShop(); WxMerchantShop wxMerchantShop=new WxMerchantShop();
wxMerchantShop.setMerchantId(wxMerchant.getId()); wxMerchantShop.setMerchantId(wxMerchant.getId());
wxMerchantShop.setIsDel(0);
wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode());
List<WxShop> shops = new ArrayList<>(); List<WxShop> shops = new ArrayList<>();


WxRentContract wxRentContract = new WxRentContract(); WxRentContract wxRentContract = new WxRentContract();
@@ -101,7 +99,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {


WxMerchantBUser wxMerchantBUser = new WxMerchantBUser(); WxMerchantBUser wxMerchantBUser = new WxMerchantBUser();
wxMerchantBUser.setMerchantId(wxMerchant.getId()); wxMerchantBUser.setMerchantId(wxMerchant.getId());
wxMerchantBUser.setStatus(0);
wxMerchantBUser.setStatus(EnumMerchantBUserStatus.BOUND.getCode());
List<WxMerchantBUser> bUserList = wxMerchantBUserMapper.findList(wxMerchantBUser); List<WxMerchantBUser> bUserList = wxMerchantBUserMapper.findList(wxMerchantBUser);
wxMerchant.setbUsers(bUserList); wxMerchant.setbUsers(bUserList);
return wxMerchant; return wxMerchant;
@@ -116,7 +114,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
@Override @Override
public void disable(Long id) { public void disable(Long id) {
WxMerchant wxMerchant = wxMerchantMapper.selectByPrimaryKey(id); WxMerchant wxMerchant = wxMerchantMapper.selectByPrimaryKey(id);
wxMerchant.setStatus(0);
wxMerchant.setStatus(EnumMerchantStatus.NOT_VALID.getCode());
wxMerchantMapper.updateByPrimaryKeySelective(wxMerchant); wxMerchantMapper.updateByPrimaryKeySelective(wxMerchant);


//解绑商铺 //解绑商铺
@@ -125,7 +123,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
wxMerchantShopQuery.setMerchantId(wxMerchant.getId()); wxMerchantShopQuery.setMerchantId(wxMerchant.getId());
List<WxMerchantShop> wxMerchantShopList = wxMerchantShopMapper.findList(wxMerchantShopQuery); List<WxMerchantShop> wxMerchantShopList = wxMerchantShopMapper.findList(wxMerchantShopQuery);
for(WxMerchantShop merchantShop:wxMerchantShopList){ for(WxMerchantShop merchantShop:wxMerchantShopList){
merchantShop.setIsDel(1);
merchantShop.setIsDel(EnumDelStatus.DEL.getCode());
wxMerchantShopMapper.updateByPrimaryKeySelective(merchantShop); wxMerchantShopMapper.updateByPrimaryKeySelective(merchantShop);


//更新商铺状态 //更新商铺状态
@@ -151,7 +149,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
long merchantid = idWorker.nextId(); long merchantid = idWorker.nextId();
wxMerchant.setId(merchantid); wxMerchant.setId(merchantid);
Date date = new Date(); Date date = new Date();
wxMerchant.setStatus(1);
wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode());
wxMerchant.setUpdateDate(date); wxMerchant.setUpdateDate(date);
wxMerchant.setCreateDate(date); wxMerchant.setCreateDate(date);
wxMerchantMapper.insertSelective(wxMerchant); wxMerchantMapper.insertSelective(wxMerchant);
@@ -185,7 +183,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
Date shopdate = new Date(); Date shopdate = new Date();
wxMerchantShop.setUpdateDate(shopdate); wxMerchantShop.setUpdateDate(shopdate);
wxMerchantShop.setCreateDate(shopdate); wxMerchantShop.setCreateDate(shopdate);
wxMerchantShop.setIsDel(0);
wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode());
wxMerchantShop.setRentalStartDate(wxMerchant.getRentalStartDate()); wxMerchantShop.setRentalStartDate(wxMerchant.getRentalStartDate());
wxMerchantShop.setRentalEndDate(wxMerchant.getRentalEndDate()); wxMerchantShop.setRentalEndDate(wxMerchant.getRentalEndDate());
wxMerchantShopMapper.insertSelective(wxMerchantShop); wxMerchantShopMapper.insertSelective(wxMerchantShop);
@@ -210,7 +208,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
date = new Date(); date = new Date();
user.setCreateDate(date); user.setCreateDate(date);
user.setUpdateDate(date); user.setUpdateDate(date);
user.setStatus(0);
user.setStatus(EnumMerchantBUserStatus.NOT_BOUND.getCode());
wxMerchantBUserMapper.insertSelective(user); wxMerchantBUserMapper.insertSelective(user);


} //添加商户的分账账户(不是必选) } //添加商户的分账账户(不是必选)
@@ -249,7 +247,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
wxMerchantShopQuery.setMerchantId(wxMerchant.getId()); wxMerchantShopQuery.setMerchantId(wxMerchant.getId());
List<WxMerchantShop> wxMerchantShopList = wxMerchantShopMapper.findList(wxMerchantShopQuery); List<WxMerchantShop> wxMerchantShopList = wxMerchantShopMapper.findList(wxMerchantShopQuery);
for(WxMerchantShop merchantShop:wxMerchantShopList){ for(WxMerchantShop merchantShop:wxMerchantShopList){
merchantShop.setIsDel(1);
merchantShop.setIsDel(EnumDelStatus.DEL.getCode());
wxMerchantShopMapper.updateByPrimaryKeySelective(merchantShop); wxMerchantShopMapper.updateByPrimaryKeySelective(merchantShop);


//更新商铺状态 //更新商铺状态
@@ -272,7 +270,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
wxMerchantShop.setCreateDate(shopdate); wxMerchantShop.setCreateDate(shopdate);
wxMerchantShop.setRentalStartDate(wxMerchant.getRentalStartDate()); wxMerchantShop.setRentalStartDate(wxMerchant.getRentalStartDate());
wxMerchantShop.setRentalEndDate(wxMerchant.getRentalEndDate()); wxMerchantShop.setRentalEndDate(wxMerchant.getRentalEndDate());
wxMerchantShop.setIsDel(0);
wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode());
wxMerchantShopMapper.insertSelective(wxMerchantShop); wxMerchantShopMapper.insertSelective(wxMerchantShop);


//更新商铺状态 //更新商铺状态
@@ -289,7 +287,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
bUser.setMerchantId(wxMerchant.getId()); bUser.setMerchantId(wxMerchant.getId());
List<WxMerchantBUser> wxMerchantBUserMapperList = wxMerchantBUserMapper.findList(bUser); List<WxMerchantBUser> wxMerchantBUserMapperList = wxMerchantBUserMapper.findList(bUser);
for(WxMerchantBUser wxMerchantBUser:wxMerchantBUserMapperList){ for(WxMerchantBUser wxMerchantBUser:wxMerchantBUserMapperList){
wxMerchantBUser.setStatus(1);
wxMerchantBUser.setStatus(EnumMerchantBUserStatus.NOT_BOUND.getCode());
wxMerchantBUserMapper.updateByPrimaryKeySelective(wxMerchantBUser); wxMerchantBUserMapper.updateByPrimaryKeySelective(wxMerchantBUser);
} }


@@ -306,7 +304,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
date = new Date(); date = new Date();
user.setCreateDate(date); user.setCreateDate(date);
user.setUpdateDate(date); user.setUpdateDate(date);
user.setStatus(0);
user.setStatus(EnumMerchantBUserStatus.BOUND.getCode());
wxMerchantBUserMapper.insertSelective(user); wxMerchantBUserMapper.insertSelective(user);
}else{//有id的更新 }else{//有id的更新
user.setBUserId(user.getId()); user.setBUserId(user.getId());
@@ -315,7 +313,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
user.setAppId(wxAppinfo.getAppId()); user.setAppId(wxAppinfo.getAppId());
date = new Date(); date = new Date();
user.setUpdateDate(date); user.setUpdateDate(date);
user.setStatus(0);
user.setStatus(EnumMerchantBUserStatus.BOUND.getCode());
wxMerchantBUserMapper.updateByPrimaryKeySelective(user); wxMerchantBUserMapper.updateByPrimaryKeySelective(user);
} }


@@ -351,7 +349,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
WxBillRent wxBillRent = new WxBillRent(); WxBillRent wxBillRent = new WxBillRent();
wxBillRent.setId(idWorker.nextId()); wxBillRent.setId(idWorker.nextId());
wxBillRent.setShopId(wxshop.getId()); wxBillRent.setShopId(wxshop.getId());
wxBillRent.setPayStatus(0);
wxBillRent.setPayStatus(EnumBillRentStatus.NOT_PAID.getCode());
wxBillRent.setPay(new BigDecimal(0)); wxBillRent.setPay(new BigDecimal(0));
wxBillRent.setTenantId(wxshop.getTenantId()); wxBillRent.setTenantId(wxshop.getTenantId());
BigDecimal needpay = wxRentContract.getPayArea().multiply(wxRentContract.getPrice()); BigDecimal needpay = wxRentContract.getPayArea().multiply(wxRentContract.getPrice());
@@ -359,7 +357,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
wxBillRent.setExpiredDay(0); wxBillRent.setExpiredDay(0);
wxBillRent.setOwe(new BigDecimal(0)); wxBillRent.setOwe(new BigDecimal(0));
wxBillRent.setPayDate(rentalStartDate); wxBillRent.setPayDate(rentalStartDate);
wxBillRent.setPayWay(4);
wxBillRent.setPayWay(EnumBillRentPayWay.CASH.getCode());
wxBillRent.setPrice(wxRentContract.getPrice()); wxBillRent.setPrice(wxRentContract.getPrice());
wxBillRent.setReceiptNum(""); wxBillRent.setReceiptNum("");
wxBillRent.setReceiveDate(rentalStartDate); wxBillRent.setReceiveDate(rentalStartDate);
@@ -383,14 +381,14 @@ public class WxMerchantServiceImpl implements WxMerchantService {
WxBillRent wxBillRent = new WxBillRent(); WxBillRent wxBillRent = new WxBillRent();
wxBillRent.setId(idWorker.nextId()); wxBillRent.setId(idWorker.nextId());
wxBillRent.setShopId(wxshop.getId()); wxBillRent.setShopId(wxshop.getId());
wxBillRent.setPayStatus(0);
wxBillRent.setPayStatus(EnumBillRentStatus.NOT_PAID.getCode());
wxBillRent.setPay(new BigDecimal(0)); wxBillRent.setPay(new BigDecimal(0));
wxBillRent.setTenantId(wxshop.getTenantId()); wxBillRent.setTenantId(wxshop.getTenantId());
wxBillRent.setNeedPay(needpaymoney); wxBillRent.setNeedPay(needpaymoney);
wxBillRent.setExpiredDay(0); wxBillRent.setExpiredDay(0);
wxBillRent.setOwe(new BigDecimal(0)); wxBillRent.setOwe(new BigDecimal(0));
wxBillRent.setPayDate(rentalStartDate); wxBillRent.setPayDate(rentalStartDate);
wxBillRent.setPayWay(4);
wxBillRent.setPayWay(EnumBillRentPayWay.CASH.getCode());
wxBillRent.setPrice(wxRentContract.getPrice()); wxBillRent.setPrice(wxRentContract.getPrice());
wxBillRent.setReceiptNum(""); wxBillRent.setReceiptNum("");
wxBillRent.setReceiveDate(rentalStartDate); wxBillRent.setReceiveDate(rentalStartDate);
@@ -416,14 +414,14 @@ public class WxMerchantServiceImpl implements WxMerchantService {
WxBillRent wxBillRent = new WxBillRent(); WxBillRent wxBillRent = new WxBillRent();
wxBillRent.setId(idWorker.nextId()); wxBillRent.setId(idWorker.nextId());
wxBillRent.setShopId(wxshop.getId()); wxBillRent.setShopId(wxshop.getId());
wxBillRent.setPayStatus(0);
wxBillRent.setPayStatus(EnumBillRentStatus.NOT_PAID.getCode());
wxBillRent.setPay(new BigDecimal(0)); wxBillRent.setPay(new BigDecimal(0));
wxBillRent.setTenantId(wxshop.getTenantId()); wxBillRent.setTenantId(wxshop.getTenantId());
wxBillRent.setNeedPay(needpaymoney); wxBillRent.setNeedPay(needpaymoney);
wxBillRent.setExpiredDay(0); wxBillRent.setExpiredDay(0);
wxBillRent.setOwe(new BigDecimal(0)); wxBillRent.setOwe(new BigDecimal(0));
wxBillRent.setPayDate(rentalStartDate); wxBillRent.setPayDate(rentalStartDate);
wxBillRent.setPayWay(4);
wxBillRent.setPayWay(EnumBillRentPayWay.CASH.getCode());
wxBillRent.setPrice(wxRentContract.getPrice()); wxBillRent.setPrice(wxRentContract.getPrice());
wxBillRent.setReceiptNum(""); wxBillRent.setReceiptNum("");
wxBillRent.setReceiveDate(rentalStartDate); wxBillRent.setReceiveDate(rentalStartDate);
@@ -448,14 +446,14 @@ public class WxMerchantServiceImpl implements WxMerchantService {
WxBillRent wxBillRent = new WxBillRent(); WxBillRent wxBillRent = new WxBillRent();
wxBillRent.setId(idWorker.nextId()); wxBillRent.setId(idWorker.nextId());
wxBillRent.setShopId(wxshop.getId()); wxBillRent.setShopId(wxshop.getId());
wxBillRent.setPayStatus(0);
wxBillRent.setPayStatus(EnumBillRentStatus.NOT_PAID.getCode());
wxBillRent.setPay(new BigDecimal(0)); wxBillRent.setPay(new BigDecimal(0));
wxBillRent.setTenantId(wxshop.getTenantId()); wxBillRent.setTenantId(wxshop.getTenantId());
wxBillRent.setNeedPay(needpaymoney); wxBillRent.setNeedPay(needpaymoney);
wxBillRent.setExpiredDay(0); wxBillRent.setExpiredDay(0);
wxBillRent.setOwe(new BigDecimal(0)); wxBillRent.setOwe(new BigDecimal(0));
wxBillRent.setPayDate(rentalStartDate); wxBillRent.setPayDate(rentalStartDate);
wxBillRent.setPayWay(4);
wxBillRent.setPayWay(EnumBillRentPayWay.CASH.getCode());
wxBillRent.setPrice(wxRentContract.getPrice()); wxBillRent.setPrice(wxRentContract.getPrice());
wxBillRent.setReceiptNum(""); wxBillRent.setReceiptNum("");
wxBillRent.setReceiveDate(rentalStartDate); wxBillRent.setReceiveDate(rentalStartDate);


+ 1
- 1
mallinkService/src/main/resources/mapper/WxMerchantMapper.xml View File

@@ -29,7 +29,7 @@
</if> </if>
<if test=" null != tenantId "> <if test=" null != tenantId ">
and `tenant_id` like concat('%', #{tenantId},'%')
and `tenant_id` = #{tenantId}
</if> </if>


Loading…
Cancel
Save