Просмотр исходного кода

Merge tag 'refs/tags/jenkins-back-end-1958' into release

develop

# Conflicts:
#	mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java
#	mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
#	mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java
#	mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java
#	mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
#	mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java
#	mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
#	mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
#	mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml
#	mallinkService/src/main/resources/mapper/WxRentContractMapper.xml
release_toaliyun_real
Stormeye Wu 7 лет назад
Родитель
Сommit
cbe6074350
100 измененных файлов: 1114 добавлений и 686 удалений
  1. +4
    -4
      mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java
  2. +20
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java
  3. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantShopController.java
  4. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxTagsController.java
  5. +4
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/car/WxParkController.java
  6. +31
    -14
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java
  7. +18
    -11
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  8. +74
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java
  9. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java
  10. +98
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/device/KwBoxController.java
  11. +168
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java
  12. +45
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterDataController.java
  13. +96
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java
  14. +109
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java
  15. +11
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java
  16. +40
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java
  17. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java
  18. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java
  19. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java
  20. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java
  21. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxRefundOrderController.java
  22. +5
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxSubsidyController.java
  23. +4
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxTopicController.java
  24. +8
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java
  25. +23
    -18
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java
  26. +6
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java
  27. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxUserChannelController.java
  28. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java
  29. +10
    -5
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java
  30. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java
  31. +7
    -7
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java
  32. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java
  33. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java
  34. +43
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserActionController.java
  35. +2
    -19
      mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java
  36. +5
    -4
      mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java
  37. +4
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java
  38. +3
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java
  39. +108
    -24
      mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java
  40. +12
    -0
      mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java
  41. +1
    -1
      mallinkAdmin/src/main/resources/application-dev.yml
  42. +1
    -1
      mallinkAdmin/src/main/resources/application-prod.yml
  43. +1
    -1
      mallinkAdmin/src/main/resources/application-test.yml
  44. +0
    -4
      mallinkAdmin/src/main/resources/db/migration/V201905061341__L_VAL_MSG_MODEL.sql
  45. +0
    -4
      mallinkAdmin/src/main/resources/db/migration/V201905061350__ADD_COLUMN_ACTIVE_TIME.sql
  46. +0
    -78
      mallinkAdmin/src/main/resources/db/migration/V201905061425__L_VAL_MSG_MODEL_DATA.sql
  47. +0
    -2
      mallinkAdmin/src/main/resources/db/migration/V201905061431__L_VAL_MSG_MODEL_DATA_DEL.sql
  48. +0
    -1
      mallinkAdmin/src/main/resources/db/migration/V201905061550__MERCHANT_UPDATE.sql
  49. +0
    -1
      mallinkAdmin/src/main/resources/db/migration/V201905061616__MODIFY_SCORE_RULES.sql
  50. +0
    -4
      mallinkAdmin/src/main/resources/db/migration/V201905071520__CHANGE_MALL.sql
  51. +0
    -1
      mallinkAdmin/src/main/resources/db/migration/V201905081200__UPDATE_SHARIING_RECEIVER.sql
  52. +0
    -102
      mallinkAdmin/src/main/resources/db/migration/V201905081900__UPDATE_MSG_MODEL.sql
  53. +0
    -5
      mallinkAdmin/src/main/resources/db/migration/V201905081901__UPDATE_SHARIING_RECEIVER.sql
  54. +0
    -4
      mallinkAdmin/src/main/resources/db/migration/V201905082030__ADD_COLUMN_PLATENUMBER.sql
  55. +0
    -2
      mallinkAdmin/src/main/resources/db/migration/V201905091750__CHANGE_COUPON_CHANNEL.sql
  56. +0
    -4
      mallinkAdmin/src/main/resources/db/migration/V201905091758__L_UPDATE_COUPON_CHANNEL.sql
  57. +0
    -24
      mallinkAdmin/src/main/resources/db/migration/V201905101050__UPDATE_MSG_MODEL.sql
  58. +0
    -9
      mallinkAdmin/src/main/resources/db/migration/V201905131552__S3_IMG_TABLE.sql
  59. +0
    -5
      mallinkAdmin/src/main/resources/db/migration/V201905131644__L_TRADE.sql
  60. +0
    -9
      mallinkAdmin/src/main/resources/db/migration/V201905131843__UPDATE_TAGS.sql
  61. +0
    -2
      mallinkAdmin/src/main/resources/db/migration/V201905151408__L_ALTER_MERCHANT.sql
  62. +0
    -2
      mallinkAdmin/src/main/resources/db/migration/V201905161611__UPATE_BILL.sql
  63. +0
    -2
      mallinkAdmin/src/main/resources/db/migration/V201905161621__ADD_MERCHANT_INTRODUCTION.sql
  64. +0
    -7
      mallinkAdmin/src/main/resources/db/migration/V201905171447__ADD_COUPON_COVER_IMG.sql
  65. +0
    -7
      mallinkAdmin/src/main/resources/db/migration/V201905171614__ADD_CAMPAIGN_COVER_PICTURE.sql
  66. +0
    -7
      mallinkAdmin/src/main/resources/db/migration/V201905171621__ADD_TOPIC_COVER_PICTURE.sql
  67. +0
    -1
      mallinkAdmin/src/main/resources/db/migration/V201905171800__L_ALTER_MSG.sql
  68. +0
    -155
      mallinkAdmin/src/main/resources/db/migration/V201905181020__CHANGE_PERMISSION.sql
  69. +0
    -2
      mallinkAdmin/src/main/resources/db/migration/V201905191020__CHANGE_TEMPLATE_MSG.sql
  70. +0
    -17
      mallinkAdmin/src/main/resources/db/migration/V201905201046__UPDATE_TEMPLATE_MSG.sql
  71. +0
    -5
      mallinkAdmin/src/main/resources/db/migration/V201905201108__L_ALTER_RENT.sql
  72. +0
    -7
      mallinkAdmin/src/main/resources/db/migration/V201905201349__ADD_COUPON_DETAIL_IMG.sql
  73. +0
    -7
      mallinkAdmin/src/main/resources/db/migration/V201905201350__ADD_CAMPAIGN_DETAIL_PICTURE.sql
  74. +0
    -7
      mallinkAdmin/src/main/resources/db/migration/V201905201351__ADD_TOPIC_DETAIL_PICTURE.sql
  75. +0
    -1
      mallinkAdmin/src/main/resources/db/migration/V201905211335__L_ALTER_RENT.sql
  76. +0
    -5
      mallinkAdmin/src/main/resources/db/migration/V201905211601__L_ALTER_RENT.sql
  77. +0
    -2
      mallinkAdmin/src/main/resources/db/migration/V201905231016__ADD_MERCHANT_ACTION.sql
  78. +0
    -2
      mallinkAdmin/src/main/resources/db/migration/V201905231052__L_ALTER_RENT.sql
  79. +0
    -2
      mallinkAdmin/src/main/resources/db/migration/V201905251112__ADD_INDEX_FOR_MALL_USER.sql
  80. +0
    -2
      mallinkAdmin/src/main/resources/db/migration/V201905251514__L_ALTER_RENT.sql
  81. +0
    -1
      mallinkAdmin/src/main/resources/db/migration/V201905271447__L_ALTER_MSG.sql
  82. +0
    -2
      mallinkAdmin/src/main/resources/db/migration/V201905281000__ADD_SCREENSHOT_FOR_AUDIT.sql
  83. +0
    -2
      mallinkAdmin/src/main/resources/db/migration/V201905291742___RENT_CONTRACT.sql
  84. +0
    -1
      mallinkAdmin/src/main/resources/db/migration/V201905301150___MERCHANT_UPDATE.sql
  85. +0
    -3
      mallinkAdmin/src/main/resources/db/migration/V201905301325___UPDATE_MENU_ICON.sql
  86. +0
    -53
      mallinkAdmin/src/main/resources/db/migration/V201905301346__ADD_SYS_MONITOR.sql
  87. +0
    -2
      mallinkAdmin/src/main/resources/db/migration/V201905301400___PROPERTY_CONTRACT.sql
  88. +22
    -0
      mallinkAdmin/src/main/resources/db/migration/V201906041320__ADD_ACTIVITY_TABLE.sql
  89. +10
    -4
      mallinkAdmin/src/main/resources/db/migration/V201906041506__ADD_MENU.sql
  90. +20
    -0
      mallinkAdmin/src/main/resources/db/migration/V201906041700__ADD_CAMPAIGN_JOIN.sql
  91. +1
    -0
      mallinkAdmin/src/main/resources/db/migration/V201906041735__ALTER_CAMPAIGN_JOIN.sql
  92. +1
    -0
      mallinkAdmin/src/main/resources/db/migration/V201906041745__ALTER_ACTIVITY_TABLE.sql
  93. +2
    -0
      mallinkAdmin/src/main/resources/db/migration/V201906051308__L_ALTER_RENT.sql
  94. +18
    -0
      mallinkAdmin/src/main/resources/db/migration/V201906051345__ADD_MSG_MODEL.sql
  95. +18
    -0
      mallinkAdmin/src/main/resources/db/migration/V201906051346__ADD_MSG_MODEL.sql
  96. +2
    -0
      mallinkAdmin/src/main/resources/db/migration/V201906051403__L_ALTER_RENT.sql
  97. +2
    -0
      mallinkAdmin/src/main/resources/db/migration/V201906051500__ALTER_CAMPAIGN_JOIN.sql
  98. +2
    -0
      mallinkAdmin/src/main/resources/db/migration/V201906051530__ALTER_CAMPAIGN.sql
  99. +7
    -0
      mallinkAdmin/src/main/resources/db/migration/V201906051702__ALTER_CAMPAIGN.sql
  100. +32
    -0
      mallinkAdmin/src/main/resources/db/migration/V201906051712__ADD_MENU.sql

+ 4
- 4
mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java Просмотреть файл

@@ -2,8 +2,8 @@ package com.iformall.controller.app;

import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.binarywang.wx.miniapp.bean.WxMaCodeLineColor;
import com.alibaba.druid.support.json.JSONUtils;
import com.amazonaws.services.s3.model.ObjectMetadata;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
@@ -25,7 +25,6 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.task.AsyncTaskExecutor;
import org.springframework.web.bind.annotation.*;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -65,7 +64,7 @@ public class WxAppinfoController extends BaseController {

ExecutorService fixedThreadPool = Executors.newFixedThreadPool(150);

@ApiOperation("加载老数据二维码")
@ApiOperation("门店二维码--二维码数据刷数据库")
@GetMapping("/updateQrCode")
public void updateQrCode(String p)throws ServletException, IOException {
if("xlldxx".equals(p)) {
@@ -89,7 +88,7 @@ public class WxAppinfoController extends BaseController {
}
}

@ApiOperation("加载卷二维码")
@ApiOperation("券二维码--二维码数据刷数据库")
@GetMapping("/updateCouponQrCode")
public void updateCouponQrCode(String p)throws ServletException, IOException {
if("xlldxx".equals(p)){
@@ -115,6 +114,7 @@ public class WxAppinfoController extends BaseController {

@ApiOperation(value = "下载二维码", produces="application/json;charset=UTF-8", notes = "参数{\"name\":\"String\",\"pageUrl\":\"String\", \"sceneParam\":\"二维码参数\", \"type\":0:有限二维码,1:无限二维码,\"withText\":int(0:不带字, 1:加一行字,2:加两行字),\"text1\":\"String\",\"text2\":\"String\"}")
@PostMapping("/downQrCode")
@SystemControllerLog(description = "营销物料--下载二维码")
public void downQrCode(HttpServletRequest request, HttpServletResponse response, @RequestBody Map<String, Object> params) throws MallinkException {
logger.debug("[" + getIpAddr() + "] WxAppinfoController::downQrCode");
String name = (String) params.get("name");


+ 20
- 1
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java Просмотреть файл

@@ -6,10 +6,14 @@ import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxBrand;
import com.iformall.domain.po.WxMerchant;
import com.iformall.enums.EnumDelFlag;
import com.iformall.service.WxBrandService;
import com.iformall.service.WxMerchantService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +34,8 @@ public class WxBrandController extends BaseController {

@Autowired
private WxBrandService wxBrandService;
@Autowired
private WxMerchantService wxMerchantService;


@GetMapping("list")
@@ -60,7 +66,20 @@ public class WxBrandController extends BaseController {
public ResultData update(@RequestBody WxBrand wxBrand) {
logger.debug("[" + getIpAddr() + "] WxBrandController::update");
wxBrand.setTenantId(getTenantId());
return wxBrandService.update(wxBrand);

if(EnumDelFlag.YES.getCode().equals(wxBrand.getIsDel())){
//判断是否解绑商户
WxMerchant wxMerchant = new WxMerchant();
wxMerchant.setTenantId(wxBrand.getTenantId());
wxMerchant.setIsDel(0);
wxMerchant.setBrand(wxBrand.getId());
List<WxMerchant> merchantList = wxMerchantService.findList(wxMerchant);
if(CollectionUtils.isNotEmpty(merchantList)){
return new ResultData(Result.ERROR, "您有未解绑的商户,请先解绑。");
}
}
wxBrandService.update(wxBrand);
return new ResultData(Result.SUCCESS, "操作成功");
}

@GetMapping("/del")


+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantShopController.java Просмотреть файл

@@ -1,6 +1,7 @@
package com.iformall.controller.basic;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxMerchantShop;
@@ -27,6 +28,7 @@ public class WxMerchantShopController extends BaseController {
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
@SystemControllerLog(description = "商户商铺--获取关联商铺信息")
public ResultData queryShopList(@ModelAttribute WxMerchantShop wxMerchantShop, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxMerchantShopController::queryShopList");
if (null == wxMerchantShop) wxMerchantShop = new WxMerchantShop();


+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxTagsController.java Просмотреть файл

@@ -34,6 +34,7 @@ public class WxTagsController extends BaseController {

@GetMapping("getAllList")
@ApiOperation("标签弹窗接口")
@SystemControllerLog(description = "会员管理-标签获取")
public ResultData getAllList() {
logger.debug("[" + getIpAddr() + "] WxTagsController::getAllList");
return new ResultData(wxTagsService.listAllVo());


+ 4
- 0
mallinkAdmin/src/main/java/com/iformall/controller/car/WxParkController.java Просмотреть файл

@@ -38,6 +38,7 @@ public class WxParkController extends BaseController {

@ApiOperation("新增接口")
@PostMapping("add")
@SystemControllerLog(description = "停车-新增停车场")
public ResultData add(@RequestBody WxPark wxPark) {
logger.debug("[" + getIpAddr() + "] WxParkController::add");
//Assert.notNull(wxPark.getName(), "角色名不能为空");
@@ -48,6 +49,7 @@ public class WxParkController extends BaseController {

@ApiOperation("根据id更新接口")
@PostMapping("update")
@SystemControllerLog(description = "停车-停车场信息更新")
public ResultData update(@RequestBody WxPark wxPark) {
logger.debug("[" + getIpAddr() + "] WxParkController::update");
wxParkService.saveOrUpdate(wxPark);
@@ -57,6 +59,7 @@ public class WxParkController extends BaseController {
@ApiOperation("根据id删除接口")
@GetMapping("/del")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
@SystemControllerLog(description = "停车-停车场删除")
public ResultData delete(Long id) {
logger.debug("[" + getIpAddr() + "] WxParkController::delete");
wxParkService.deleteById(id);
@@ -66,6 +69,7 @@ public class WxParkController extends BaseController {
@ApiOperation("根据id查询接口")
@GetMapping("/findById")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
@SystemControllerLog(description = "停车-查询")
public ResultData findById(Long id) {
logger.debug("[" + getIpAddr() + "] WxParkController::findById");
return new ResultData(Result.SUCCESS, "查询成功", wxParkService.getById(id));


+ 31
- 14
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java Просмотреть файл

@@ -60,11 +60,12 @@ public class WxPropertyContractController extends BaseController {
MallUserInfo user = getUser();
wxPropertyContract.setTenantId(user.getTenantId());
wxPropertyContract.setAdjustPeriodHandle();
Date oldDate = wxPropertyContract.getRentalStartDate();

if(wxPropertyContract.getRentStartType()!=null && wxPropertyContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){
wxPropertyContract.setRentalStartDate(wxPropertyContract.getStartDate());
}
return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName(),0);
return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName(), oldDate);
}

@PostMapping("updateRentStartTime")
@@ -73,6 +74,7 @@ public class WxPropertyContractController extends BaseController {
logger.debug("[" + getIpAddr() + "] WxPropertyContractController::updateRentStartTime");
WxPropertyContract propertyContract = wxPropertyContractMapper.selectByPrimaryKey(wxPropertyContract.getId());
propertyContract.setRentalStartDate(wxPropertyContract.getRentalStartDate());
Date oldDate = wxPropertyContract.getRentalStartDate();

if(wxPropertyContract.getRentStartType()!=null && wxPropertyContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){
propertyContract.setRentalStartDate(propertyContract.getStartDate());
@@ -81,21 +83,28 @@ public class WxPropertyContractController extends BaseController {
MallUserInfo user = getUser();
propertyContract.setTenantId(user.getTenantId());
propertyContract.setAdjustPeriodHandle();
return wxPropertyContractService.saveOrUpdate(propertyContract, user.getId(), user.getName(),1);
propertyContract.setRentStartType(wxPropertyContract.getRentStartType());
return wxPropertyContractService.saveOrUpdate(propertyContract, user.getId(), user.getName(), oldDate);
}


@PostMapping("update")
@SystemControllerLog(description = "物业合同-修改")
public ResultData update(@RequestBody WxPropertyContract wxPropertyContract) {
logger.debug("[" + getIpAddr() + "] WxPropertyContractController::update");
MallUserInfo user = getUser();
wxPropertyContract.setTenantId(user.getTenantId());
wxPropertyContract.setAdjustPeriodHandle();
if(wxPropertyContract.getRentStartType()!=null && wxPropertyContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){
wxPropertyContract.setRentalStartDate(wxPropertyContract.getStartDate());
WxPropertyContract propertyContract = wxPropertyContractMapper.selectByPrimaryKey(wxPropertyContract.getId());
propertyContract.setRentalStartDate(wxPropertyContract.getRentalStartDate());
Date oldDate = wxPropertyContract.getRentalStartDate();

if (wxPropertyContract.getRentStartType() != null && wxPropertyContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())) {
propertyContract.setRentalStartDate(propertyContract.getStartDate());
}
return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName(),0);

MallUserInfo user = getUser();
propertyContract.setTenantId(user.getTenantId());
propertyContract.setAdjustPeriodHandle();
propertyContract.setRentStartType(wxPropertyContract.getRentStartType());
//第三步提交 SWITCH
return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName(), oldDate);
}

@GetMapping("/del")
@@ -115,7 +124,8 @@ public class WxPropertyContractController extends BaseController {
WxBillProperty wxBillProperty = new WxBillProperty();
wxBillProperty.setTenantId(super.getTenantId());
wxBillPropertyService.updateBillStatus(wxBillProperty);
return wxPropertyContractService.getById(id);
Map<String, Object> data = wxPropertyContractService.getById(id);
return new ResultData(data);
}

@RequestMapping("/download")
@@ -165,13 +175,20 @@ public class WxPropertyContractController extends BaseController {
return wxPropertyContractService.hasRentContract(rentContractId);
}

@GetMapping("updatePropertyContractStatus")
@PostMapping("updatePropertyContractStatus")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
@SystemControllerLog(description = "物业合同-更新合同状态")
public ResultData updatePropertyContractStatus(Long id) {
logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentContractStatus");
return wxPropertyContractService.updatePropertyContractStatus(id);
public ResultData updatePropertyContractStatus(@RequestBody WxPropertyContract wxPropertyContract) {
logger.debug("[" + getIpAddr() + "] WxPropertyContractController::updateRentContractStatus");
return wxPropertyContractService.updatePropertyContractStatus(wxPropertyContract.getId());
}

@PostMapping("endContract")
@SystemControllerLog(description = "物业合同-终止合同")
public ResultData endContract(@RequestBody WxPropertyContract wxPropertyContract) {
logger.debug("[" + getIpAddr() + "] WxRentContractController::endContract");
wxPropertyContractService.endContract(wxPropertyContract);
return new ResultData();
}

}

+ 18
- 11
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java Просмотреть файл

@@ -9,9 +9,7 @@ import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.WxBillRent;
import com.iformall.domain.po.WxPayAccountBill;
import com.iformall.domain.po.WxRentContract;
import com.iformall.domain.po.WxShop;
import com.iformall.enums.EnumRentContractAdjustPeriod;
import com.iformall.enums.EnumRentShopType;
import com.iformall.enums.EnumFromType;
import com.iformall.enums.EnumRentStartType;
import com.iformall.mapper.WxRentContractMapper;
import com.iformall.service.WxBillRentService;
@@ -26,6 +24,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.text.SimpleDateFormat;
@@ -110,7 +109,8 @@ public class WxRentContractController extends BaseController {
rentContract.setTenantId(user.getTenantId());
rentContract.setAdjustPeriodHandle();
rentContract.setRentPriceHandle();
return wxRentContractService.update(rentContract, user.getId(),user.getName(),1,oldDate);
rentContract.setRentStartType(wxRentContract.getRentStartType());
return wxRentContractService.update(rentContract, user.getId(),user.getName(), EnumFromType.SWITCH.getCode(),oldDate);
}

@PostMapping("update")
@@ -125,7 +125,7 @@ public class WxRentContractController extends BaseController {
if(wxRentContract.getRentStartType()!=null && wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){
wxRentContract.setRentalStartDate(wxRentContract.getStartDate());
}
return wxRentContractService.update(wxRentContract, user.getId(),user.getName(),0,oldDate);
return wxRentContractService.update(wxRentContract, user.getId(),user.getName(),EnumFromType.OTHER.getCode(),oldDate);
}

/**
@@ -145,7 +145,7 @@ public class WxRentContractController extends BaseController {
if(wxRentContract.getRentStartType()!=null &&wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){
wxRentContract.setRentalStartDate(wxRentContract.getStartDate());
}
return wxRentContractService.update(wxRentContract, user.getId(),user.getName(),0,oldDate);
return wxRentContractService.update(wxRentContract, user.getId(),user.getName(),EnumFromType.OTHER.getCode(),oldDate);
}

@PostMapping("updateFile")
@@ -180,7 +180,8 @@ public class WxRentContractController extends BaseController {
WxBillRent wxBillRent = new WxBillRent();
wxBillRent.setTenantId(getTenantId());
wxBillRentService.updateBillStatus(wxBillRent);
return wxRentContractService.getById(id);
Map<String, Object> data = wxRentContractService.getById(id);
return new ResultData(data);
}

@RequestMapping("/download")
@@ -233,12 +234,11 @@ public class WxRentContractController extends BaseController {
wxRentContractService.exportContract(request,response,getTenantId(),id);
}

@GetMapping("updateRentContractStatus")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
@PostMapping("updateRentContractStatus")
@SystemControllerLog(description = "租赁合同-更新合同状态")
public ResultData updateRentContractStatus(Long id) {
public ResultData updateRentContractStatus(@RequestBody WxRentContract wxRentContract) {
logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentContractStatus");
return wxRentContractService.updateRentContractStatus(id);
return wxRentContractService.updateRentContractStatus(wxRentContract.getId());
}

@GetMapping("getPayAccountInfo")
@@ -297,6 +297,13 @@ public class WxRentContractController extends BaseController {
return wxRentContractService.hasContractNumber(wxRentContract);
}

@PostMapping("endContract")
@SystemControllerLog(description = "租赁合同-终止合同")
public ResultData endContract(@RequestBody WxRentContract wxRentContract) {
logger.debug("[" + getIpAddr() + "] WxRentContractController::endContract");
wxRentContractService.endContract(wxRentContract);
return new ResultData();
}
}



+ 74
- 0
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java Просмотреть файл

@@ -0,0 +1,74 @@
package com.iformall.controller.contract;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.WxRentContract;
import com.iformall.domain.vo.WxRentPropertyContractVo;
import com.iformall.service.WxRentPropertyContractService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

/**
* @author gongbiao
*/
@RestController
@RequestMapping("wxRentPropertyContract")
public class WxRentPropertyContractController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass());

@Autowired
private WxRentPropertyContractService wxRentPropertyContractService;

@GetMapping("list")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
@SystemControllerLog(description = "租赁物业合同-列表")
public ResultData list(@ModelAttribute WxRentPropertyContractVo wxRentPropertyContractVo, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] wxRentPropertyContract::list");
if (null == wxRentPropertyContractVo) {
wxRentPropertyContractVo = new WxRentPropertyContractVo();
}
wxRentPropertyContractVo.setTenantId(getTenantId());
final PageInfo<WxRentPropertyContractVo> page = wxRentPropertyContractService.listContractVo(wxRentPropertyContractVo, pageNum, pageSize);
return new ResultData(page);
}

@ApiOperation("根据id查询接口")
@GetMapping("/findById")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
@SystemControllerLog(description = "租赁物业合同-根据id查询接口")
public ResultData findById(Long id) {
logger.debug("[" + getIpAddr() + "] wxRentPropertyContract::findById");
return wxRentPropertyContractService.getContractInfo(id);
}

@ApiOperation("合同审批详情")
@GetMapping("/getContractApplyInfo")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
@SystemControllerLog(description = "租赁物业合同-合同审批详情")
public ResultData getContractApplyInfo(Long id) {
logger.debug("[" + getIpAddr() + "] wxRentPropertyContract::getContractApplyInfo");
return wxRentPropertyContractService.getContractApplyInfo(id);
}

@PostMapping("insertRentForCreate")
@SystemControllerLog(description = "租赁合同-添加")
public ResultData insertRent(@RequestBody WxRentContract wxRentContract) {
logger.debug("[" + getIpAddr() + "] wxRentPropertyContract::insertRentForCreate");
MallUserInfo user = getUser();
wxRentContract.setTenantId(user.getTenantId());
return wxRentPropertyContractService.insertRentForCreate(wxRentContract);
}

}



+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java Просмотреть файл

@@ -37,6 +37,7 @@ public class WxMerchantTradeDailyController extends BaseController {

@ApiOperation("获得指定日期的解单,默认不传reportDate为当天")
@GetMapping("/getVolume")
@SystemControllerLog(description = "解单-获得指定日期的解单")
public ResultData getVolume(WxMerchantTradeDaily wxMerchantTradeDaily) {
wxMerchantTradeDaily.setTenantId(getTenantId());
return wxMerchantTradeDailyService.getVolume(wxMerchantTradeDaily,getUser().getId());


+ 98
- 0
mallinkAdmin/src/main/java/com/iformall/controller/device/KwBoxController.java Просмотреть файл

@@ -0,0 +1,98 @@
package com.iformall.controller.device;

import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.KwBox;
import com.iformall.enums.EnumBoxStatus;
import com.iformall.service.kw.KwBoxService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;

@RestController
@RequestMapping("kwBox")
@Api(description="开物盒子")
public class KwBoxController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass());

@Autowired
private KwBoxService kwBoxService;

@ApiOperation("设备列表")
@GetMapping("list")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
@SystemControllerLog(description = "开物盒子-设备列表")
public Result list(@ModelAttribute KwBox kwBox, Integer pageNum, Integer pageSize) {
if (kwBox == null) kwBox = new KwBox();
kwBox.setTenantId(getTenantId());
kwBox.setStatus(EnumBoxStatus.VALID.getCode());
return new ResultData(kwBoxService.listAsPage(kwBox, pageNum,pageSize));
}

@ApiOperation("添加设备")
@PostMapping("add")
@SystemControllerLog(description = "开物盒子-添加设备")
public Result add(@RequestBody KwBox kwBox) {

KwBox record = new KwBox();
record.setImei(kwBox.getImei());
record.setStatus(EnumBoxStatus.VALID.getCode());
List<KwBox> list = kwBoxService.findList(record);
if (list.size() > 0)
return new ResultData(ErrorCode.DEVICE_ALREADY_EXIST);
kwBox.setTenantId(getTenantId());
kwBox.setStatus(EnumBoxStatus.VALID.getCode());
return kwBoxService.saveOrUpdate(kwBox);
}

@ApiOperation("更新设备")
@PostMapping("update")
@SystemControllerLog(description = "开物盒子-更新设备")
public Result update(@RequestBody KwBox kwBox) {
if (kwBox == null)
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
if (kwBox.getId() == null)
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
kwBox.setTenantId(getTenantId());
return kwBoxService.saveOrUpdate(kwBox);
}

@ApiOperation("设备详情")
@GetMapping("detail")
@SystemControllerLog(description = "开物盒子-设备详情")
public Result detail(@RequestParam Long id) {
if (id == null)
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
KwBox kwBox = kwBoxService.getById(id);
if (kwBox == null)
return new ResultData(ErrorCode.SCREENAD_NOT_FOUND);

kwBox.setMeters(kwBoxService.findMeters(kwBox));
return new ResultData(kwBox);
}

@ApiOperation("删除设备")
@PostMapping("delete")
@SystemControllerLog(description = "开物盒子-删除设备")
public Result delete(@RequestParam Long id) {
if (id == null)
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
KwBox kwBox = new KwBox();
kwBox.setId(id);
kwBox.setTenantId(getTenantId());
kwBox.setStatus(EnumBoxStatus.INVALID.getCode());
return kwBoxService.saveOrUpdate(kwBox);
}
}

+ 168
- 0
mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java Просмотреть файл

@@ -0,0 +1,168 @@
package com.iformall.controller.device;

import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.KwBox;
import com.iformall.domain.po.KwMeter;
import com.iformall.enums.EnumBoxStatus;
import com.iformall.enums.EnumMeterBindStatus;
import com.iformall.enums.EnumMeterStatus;
import com.iformall.service.kw.KwBoxService;
import com.iformall.service.kw.KwMeterService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;

@RestController
@RequestMapping("kwMeter")
@Api(description="电表设备")
public class KwMeterController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass());

@Autowired
private KwMeterService kwMeterService;

@Autowired
private KwBoxService kwBoxService;

@ApiOperation("设备列表")
@GetMapping("list")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
@SystemControllerLog(description = "电表设备-设备列表")
public Result list(@ModelAttribute KwMeter kwMeter, Integer pageNum, Integer pageSize) {
if (kwMeter == null) kwMeter = new KwMeter();
kwMeter.setTenantId(getTenantId());
kwMeter.setStatus(EnumMeterStatus.VALID.getCode());
return new ResultData(kwMeterService.listAsPage(kwMeter, pageNum,pageSize));
}

@ApiOperation("添加设备")
@PostMapping("add")
@SystemControllerLog(description = "电表设备-添加设备")
public Result add(@RequestBody KwMeter kwMeter) {

if (kwMeter == null)
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
if (kwMeter.getAddress() == null)
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);

KwMeter record = new KwMeter();
record.setTenantId(getTenantId());
record.setAddress(kwMeter.getAddress());
List<KwMeter> KwMeters = kwMeterService.findList(record);
if (KwMeters.size() > 0)
return new ResultData(ErrorCode.DEVICE_ALREADY_EXIST);
kwMeter.setTenantId(getTenantId());
kwMeter.setBoxId(0L);
kwMeter.setBindStatus(EnumMeterBindStatus.UNBIND.getCode());
return kwMeterService.saveOrUpdate(kwMeter);
}

@ApiOperation("绑定设备")
@PostMapping("bind")
@SystemControllerLog(description = "电表设备-添加设备")
public Result bind(@RequestBody KwMeter kwMeter) {

if (kwMeter == null)
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
if (kwMeter.getBoxId() == null)
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
if (kwMeter.getAddress() == null)
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);

KwBox kwBox = kwBoxService.getById(kwMeter.getBoxId());
if (kwBox == null)
return new ResultData(ErrorCode.DEVICE_NOT_FOUND);

KwMeter record = new KwMeter();
record.setBoxId(kwMeter.getBoxId());
List<KwMeter> KwMeters = kwMeterService.findList(record);
if (KwMeters.size() > kwBox.getMaxTagNum())
return new ResultData(ErrorCode.DEVICE_REACHED_MAX_NUMBER);

record.setBoxId(kwMeter.getBoxId());
record.setAddress(kwMeter.getAddress());
KwMeters = kwMeterService.findList(record);
if (KwMeters.size() > 0)
return new ResultData(ErrorCode.DEVICE_ALREADY_EXIST);
kwMeter.setTenantId(getTenantId());
kwMeter.setBindStatus(EnumMeterBindStatus.BIND.getCode());
return kwMeterService.saveOrUpdate(kwMeter);
}

@ApiOperation("绑定设备")
@PostMapping("unbind")
@SystemControllerLog(description = "电表设备-添加设备")
public Result unbind(@RequestBody KwMeter kwMeter) {

if (kwMeter == null)
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
if (kwMeter.getBoxId() == null)
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
if (kwMeter.getId() == null)
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);

KwBox kwBox = kwBoxService.getById(kwMeter.getBoxId());
if (kwBox == null)
return new ResultData(ErrorCode.DEVICE_NOT_FOUND);

KwMeter record = kwMeterService.getById(kwMeter.getId());
if (record == null)
return new ResultData(ErrorCode.DEVICE_NOT_FOUND);
kwMeter.setTenantId(getTenantId());
kwMeter.setBoxId(0L);
kwMeter.setBindStatus(EnumMeterBindStatus.UNBIND.getCode());
return kwMeterService.saveOrUpdate(kwMeter);
}

@ApiOperation("更新设备")
@PostMapping("update")
@SystemControllerLog(description = "电表设备-更新设备")
public Result update(@RequestBody KwMeter kwMeter) {
if (kwMeter == null)
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
if (kwMeter.getId() == null)
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
kwMeter.setTenantId(getTenantId());
return kwMeterService.saveOrUpdate(kwMeter);
}

@ApiOperation("设备详情")
@GetMapping("detail")
@SystemControllerLog(description = "电表设备-设备详情")
public Result detail(@RequestParam Long id) {
if (id == null)
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
KwMeter kwMeter = kwMeterService.getById(id);
if (kwMeter == null)
return new ResultData(ErrorCode.DEVICE_NOT_FOUND);

return new ResultData(kwMeter);
}

@ApiOperation("删除设备")
@PostMapping("delete")
@SystemControllerLog(description = "电表设备-删除设备")
public Result delete(@RequestParam Long id) {
if (id == null)
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
KwMeter kwMeter = new KwMeter();
kwMeter.setId(id);
kwMeter.setTenantId(getTenantId());
kwMeter.setStatus(EnumBoxStatus.INVALID.getCode());
return kwMeterService.saveOrUpdate(kwMeter);
}
}

+ 45
- 0
mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterDataController.java Просмотреть файл

@@ -0,0 +1,45 @@
package com.iformall.controller.device;

import com.iformall.annotation.SystemControllerLog;

import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.dto.KwMeterDataDto;

import com.iformall.domain.po.KwMeterData;

import com.iformall.service.kw.KwMeterDataService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;

@RestController
@RequestMapping("kwMeterData")
@Api(description="电表数据")
public class KwMeterDataController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass());

@Autowired
private KwMeterDataService kwMeterDataService;

@ApiOperation("数据列表")
@GetMapping("list")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
@SystemControllerLog(description = "电表设备-设备列表")
public Result list(@ModelAttribute KwMeterDataDto kwMeterDataDto, Integer pageNum, Integer pageSize) {
if (kwMeterDataDto == null) kwMeterDataDto = new KwMeterDataDto();
kwMeterDataDto.setTenantId(getTenantId());
return new ResultData(kwMeterDataService.listVoAsPage(kwMeterDataDto, pageNum,pageSize));
}

}

+ 96
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityController.java Просмотреть файл

@@ -0,0 +1,96 @@
package com.iformall.controller.market;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxActivity;
import com.iformall.enums.EnumActivityStatus;
import com.iformall.service.WxActivityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

/**
* @author gongbiao
*/
@RestController
@RequestMapping("wxActivity")
@Api(description = "活动")
public class WxActivityController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass());

@Autowired
private WxActivityService wxActivityService;

@ApiOperation("分页列表接口")
@GetMapping("list")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
@SystemControllerLog(description = "活动-列表")
public ResultData list(@ModelAttribute WxActivity wxActivity, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxActivityController::list");
if (null == wxActivity) wxActivity = new WxActivity();
if (wxActivity.getStatus() != null && wxActivity.getStatus() == -1) {
wxActivity.setStatus(null);
}
wxActivity.setTenantId(getTenantId());
wxActivity.setSortColumns(WxActivity.Field.Id_DESC);
final PageInfo<WxActivity> page = wxActivityService.listAsPage(wxActivity, pageNum, pageSize);
return new ResultData(page);
}

@ApiOperation("新增接口")
@PostMapping("add")
@SystemControllerLog(description = "活动-新增")
public ResultData add(@RequestBody WxActivity wxActivity) {
logger.debug("[" + getIpAddr() + "] WxActivityController::add");
wxActivity.setStatus(EnumActivityStatus.STATUS_THROW_IN.getCode());
wxActivity.setTenantId(getTenantId());
wxActivityService.saveOrUpdate(wxActivity);
return new ResultData();
}

@ApiOperation("根据id更新接口")
@PostMapping("update")
@SystemControllerLog(description = "活动-id更新")
public ResultData update(@RequestBody WxActivity wxActivity) {
logger.debug("[" + getIpAddr() + "] WxActivityController::update");
return wxActivityService.saveOrUpdate(wxActivity);
}

@ApiOperation("根据id更新接口")
@PostMapping("updateStatus")
@SystemControllerLog(description = "活动-更新状态")
public ResultData updateStatus(@RequestBody WxActivity wxActivity) {
logger.debug("[" + getIpAddr() + "] WxActivityController::updateStatus");
return wxActivityService.updateStatus(wxActivity);
}

@ApiOperation("根据id查询接口")
@GetMapping("/findById")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
@SystemControllerLog(description = "活动-查询")
public ResultData findById(Long id) {
logger.debug("[" + getIpAddr() + "] WxActivityController::findById");
WxActivity wxActivity = wxActivityService.getById(id);
return new ResultData(Result.SUCCESS, "查询成功", wxActivity);
}

@ApiOperation("投放到宣传页")
@GetMapping("/sendToCampaign")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
@SystemControllerLog(description = "活动-投放到宣传页")
public ResultData sendToCampaign(Long id) {
logger.debug("[" + getIpAddr() + "] WxActivityController::sendToCampaign");
return wxActivityService.sendToCampaign(id);
}

}

+ 109
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxActivityJoinController.java Просмотреть файл

@@ -0,0 +1,109 @@
package com.iformall.controller.market;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxActivityJoin;
import com.iformall.exception.MallinkException;
import com.iformall.service.WxActivityJoinService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

/**
* @author gongbiao
*/
@RestController
@RequestMapping("wxActivityJoin")
@Api(description = "活动参与信息")
public class WxActivityJoinController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass());

@Autowired
private WxActivityJoinService wxActivityJoinService;

@ApiOperation("分页列表接口")
@GetMapping("list")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
@SystemControllerLog(description = "活动参与信息-列表")
public ResultData list(@ModelAttribute WxActivityJoin wxActivityJoin, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxActivityJoinController::list");
if (null == wxActivityJoin) {
wxActivityJoin = new WxActivityJoin();
}
wxActivityJoin.setTenantId(getTenantId());
wxActivityJoin.setSortColumns(WxActivityJoin.Field.Id_DESC);
final PageInfo<WxActivityJoin> page = wxActivityJoinService.listAsPage(wxActivityJoin, pageNum, pageSize);
return new ResultData(page);
}

@ApiOperation("确认或取消报名")
@PostMapping("modifyStatus")
@SystemControllerLog(description = "活动参与信息-确认或取消报名")
public ResultData modifyStatus(@RequestBody WxActivityJoin wxActivityJoin) {
logger.debug("[" + getIpAddr() + "] WxActivityJoinController::modifyStatus");

if (wxActivityJoin.getId() == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "id不能为空");
}
if (wxActivityJoin.getActivityId() == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "activityId不能为空");
}
if (wxActivityJoin.getStatus() == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "status不能为空");
}
return wxActivityJoinService.modifyStatus(wxActivityJoin);
}

@ApiOperation("导出报名表")
@RequestMapping("/exportData")
@SystemControllerLog(description = "活动参与信息-导出报名表")
public void exportData(@ModelAttribute WxActivityJoin wxActivityJoin, HttpServletRequest request, HttpServletResponse response) {
logger.debug("[" + getIpAddr() + "] WxActivityJoinController::exportData");
if (wxActivityJoin.getActivityId() == null) {
throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "activityId不能为空");
}
wxActivityJoin.setTenantId(getTenantId());
wxActivityJoinService.exportData(request, response, wxActivityJoin);

}

@ApiOperation("查询报名总数")
@GetMapping("queryJoinInfo")
@SystemControllerLog(description = "活动参与信息-查询报名总数")
public ResultData queryJoinInfo(@ModelAttribute WxActivityJoin wxActivityJoin) {
logger.debug("[" + getIpAddr() + "] WxActivityJoinController::queryJoinInfo");

if (wxActivityJoin.getActivityId() == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "activityId不能为空");
}
wxActivityJoin.setTenantId(getTenantId());
return wxActivityJoinService.queryJoinInfo(wxActivityJoin);
}

@ApiOperation("发送短信")
@GetMapping("sendMsg")
@SystemControllerLog(description = "活动参与信息-发送短信")
public ResultData sendMsg(@ModelAttribute WxActivityJoin wxActivityJoin) {
logger.debug("[" + getIpAddr() + "] WxActivityJoinController::confirmCompletion");

if (wxActivityJoin.getActivityId() == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "activityId不能为空");
}
wxActivityJoin.setTenantId(getTenantId());
return wxActivityJoinService.sendMsg(wxActivityJoin);
}

}

+ 11
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java Просмотреть файл

@@ -82,6 +82,17 @@ public class WxCampaignController extends BaseController {
return new ResultData();
}

@ApiOperation(value = "新增接口-小程序路径", notes = "produceType,produceId,pagePath,pageScene必填")
@PostMapping("addByPath")
@SystemControllerLog(description = "宣传页-新增")
public ResultData addByPath(@RequestBody WxCampaign wxCampaign) {
logger.debug("[" + getIpAddr() + "] WxCampaignController::addByPath");
wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode());
wxCampaign.setTenantId(getTenantId());
wxCampaignService.addForPath(wxCampaign);
return new ResultData();
}

@ApiOperation("根据id更新接口")
@PostMapping("update")
@SystemControllerLog(description = "宣传页-id更新")


+ 40
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java Просмотреть файл

@@ -7,15 +7,20 @@ import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxCoupon;
import com.iformall.domain.po.WxCouponChannel;
import com.iformall.domain.vo.WxCouponStatisVo;
import com.iformall.enums.EnumCouponChannelStatus;
import com.iformall.enums.EnumCouponType;
import com.iformall.enums.EnumCouponValidType;
import com.iformall.enums.EnumDelFlag;
import com.iformall.mapper.WxCouponChannelMapper;
import com.iformall.service.WxCouponService;
import com.iformall.utils.DateUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.map.HashedMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -31,6 +36,8 @@ public class WxCouponController extends BaseController {

@Autowired
private WxCouponService wxCouponService;
@Autowired
private WxCouponChannelMapper wxCouponChannelMapper;

@ApiOperation("分页列表接口")
@GetMapping("list")
@@ -44,6 +51,29 @@ public class WxCouponController extends BaseController {
wxCoupon.setTenantId(getTenantId());
return wxCouponService.list(wxCoupon, pageNum, pageSize); //全列表
}
@ApiOperation("分页列表接口")
@GetMapping("listWithTypePress")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
@SystemControllerLog(description = "券投放-列表")
public ResultData listWithTypePress(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxCouponController::list");
if (wxCoupon == null) wxCoupon = new WxCoupon();
wxCoupon.setTenantId(getTenantId());
Integer[] typeArray = {
EnumCouponType.COUPON_MANJIAN.getCode(),
EnumCouponType.COUPON_DAIJIN.getCode(),
EnumCouponType.COUPON_TUANGOU.getCode(),
EnumCouponType.COUPON_LIPIN.getCode(),
EnumCouponType.COUPON_TINGCHE.getCode(),
EnumCouponType.COUPON_MULTIMCH.getCode(),
EnumCouponType.COUPON_PRESS.getCode()};

wxCoupon.setTypes(Arrays.asList(typeArray));
return wxCouponService.list(wxCoupon, pageNum, pageSize); //全列表
}


@ApiOperation("新增接口")
@PostMapping("add")
@@ -61,6 +91,16 @@ public class WxCouponController extends BaseController {
if (wxCoupon.getId() == null) {
return new ResultData(ResultData.ERROR, "缺少id");
}
if(EnumDelFlag.YES.getCode().equals(wxCoupon.getIsDel())){
WxCouponChannel query = new WxCouponChannel();
query.setTenantId(wxCoupon.getTenantId());
query.setCouponId(wxCoupon.getId());
query.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode());
if(CollectionUtils.isNotEmpty(wxCouponChannelMapper.findList(query))){
return new ResultData(ResultData.ERROR, "有活动正在上架,请先下架。");
}
}

wxCoupon.setTenantId(getTenantId());
return wxCouponService.saveOrUpdate(wxCoupon);
}


+ 2
- 2
mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java Просмотреть файл

@@ -28,7 +28,7 @@ public class WxMerchantMicroPayController extends BaseController {

@ApiOperation("获得商场近30日刷卡")
@GetMapping("/listMonth")
@SystemControllerLog(description = "收银台-近30日")
@SystemControllerLog(description = "收银台-近30日刷卡列表")
public ResultData listMonth() {
logger.debug("[" + getIpAddr() + "] WxMerchantMicroPayController::listMonth");
WxOrderReportDto wxOrderReportDto = new WxOrderReportDto();
@@ -41,7 +41,7 @@ public class WxMerchantMicroPayController extends BaseController {

@ApiOperation("获商户得近30日刷卡")
@GetMapping("/detail")
@SystemControllerLog(description = "收银台-近30日刷卡")
@SystemControllerLog(description = "收银台-近30日刷卡列表详情")
public ResultData detail(@RequestParam Long merchantId) {
logger.debug("[" + getIpAddr() + "] WxMerchantMicroPayController::detail");
WxOrderReportDto wxOrderReportDto = new WxOrderReportDto();


+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java Просмотреть файл

@@ -138,6 +138,7 @@ public class WxOrderController extends BaseController {

@ApiOperation(value = "积分兑换订单", notes = "{\"couponChannelId\":\"String\",\"couponId\":\"String\",\"press\":\"String\",\"orderGroupId\":\"String\",\"formId\":\"String\"}")
@PostMapping("save")
@SystemControllerLog(description = "订单管理-积分兑换订单")
public ResultData saveOrder(@RequestBody OrderSaveDto orderSaveDto) {
logger.info("OrderSave: " + orderSaveDto);
if (orderSaveDto.getCouponChannelId() == null) {


+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java Просмотреть файл

@@ -90,6 +90,7 @@ public class WxPayOrderController extends BaseController {

@ApiOperation(value = "更新支付订单状态", notes = "{\"payOrderId\":\"string\",\"orderId\":\"string\",\"status\":integer,\"reason\":\"string\"}")
@PostMapping("/updatePayOrder")
@SystemControllerLog(description = "支付订单-更新支付订单状态")
public ResultData updatePayOrder(@RequestBody Map<String, Object> paramMap) {
logger.info("/api/pay/updatePayOrder" + paramMap.toString());
String payOrderIdStr = (String) paramMap.get("payOrderId");


+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java Просмотреть файл

@@ -61,6 +61,7 @@ public class WxProfitSharingOrderController extends BaseController {
@ApiOperation("分账详情")
@GetMapping("findOrderDetails")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
@SystemControllerLog(description = "分账订单-分账详情")
public ResultData findOrderDetails(Long id) {
logger.debug("[" + getIpAddr() + "] WxProfitSharingOrderController::findOrderDetails");
return wxProfitSharingOrderService.findOrderDetails(id);


+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxRefundOrderController.java Просмотреть файл

@@ -64,6 +64,7 @@ public class WxRefundOrderController extends BaseController {
@ApiOperation("根据id删除接口")
@GetMapping("/del")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
@SystemControllerLog(description = "退款-根据id删除")
public ResultData delete(Long id) {
logger.debug("[" + getIpAddr() + "] WxRefundOrderController::delete");
wxRefundOrderService.deleteById(id);


+ 5
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxSubsidyController.java Просмотреть файл

@@ -39,6 +39,7 @@ public class WxSubsidyController extends BaseController {
@GetMapping("prePay")
@ApiImplicitParams({
@ApiImplicitParam(name = "amount", value = "金额", dataType = "String", paramType = "query", required = true)})
@SystemControllerLog(description = "商城补贴-补贴扫码支付发起")
public void subsidyPrepay(String amount, HttpServletResponse response) throws Exception {
String ipStr = getIpAddr();
logger.info("subsidyPrepay: " + ipStr + "-" + amount);
@@ -72,6 +73,7 @@ public class WxSubsidyController extends BaseController {

@ApiOperation("新增接口")
@PostMapping("add")
@SystemControllerLog(description = "商城补贴-新增接口")
public ResultData add(@RequestBody WxSubsidy wxSubsidy) {
//Assert.notNull(wxSubsidy.getName(), "角色名不能为空");
//Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名");
@@ -81,6 +83,7 @@ public class WxSubsidyController extends BaseController {

@ApiOperation("根据id更新接口")
@PostMapping("update")
@SystemControllerLog(description = "商城补贴-更新")
public ResultData update(@RequestBody WxSubsidy wxSubsidy) {
wxSubsidyService.saveOrUpdate(wxSubsidy);
return new ResultData();
@@ -89,6 +92,7 @@ public class WxSubsidyController extends BaseController {
@ApiOperation("根据id删除接口")
@GetMapping("/del")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
@SystemControllerLog(description = "商城补贴-删除")
public ResultData delete(Long id) {
wxSubsidyService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
@@ -97,6 +101,7 @@ public class WxSubsidyController extends BaseController {
@ApiOperation("根据id查询接口")
@GetMapping("/findById")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
@SystemControllerLog(description = "商城补贴-查询")
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS, "查询成功", wxSubsidyService.getById(id));
}


+ 4
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxTopicController.java Просмотреть файл

@@ -1,6 +1,7 @@
package com.iformall.controller.market;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.*;
@@ -27,6 +28,7 @@ public class WxTopicController extends BaseController {
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
@SystemControllerLog(description = "专题-列表")
public ResultData list(WxTopic wxTopic, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxTopicController::list");
String tenantId = getTenantId();
@@ -47,6 +49,7 @@ public class WxTopicController extends BaseController {
}

@GetMapping("findById")
@SystemControllerLog(description = "专题-获取详情")
public ResultData findById(WxTopic wxTopic) {
logger.debug("[" + getIpAddr() + "] WxTopicController::findById");
String tenantId = getTenantId();
@@ -56,6 +59,7 @@ public class WxTopicController extends BaseController {
}

@PostMapping("saveOrUpdate")
@SystemControllerLog(description = "专题-保存更新")
public ResultData saveOrUpdate(@RequestBody WxTopic wxTopic) {
logger.debug("[" + getIpAddr() + "] WxTopicController::saveOrUpdate");
wxTopic.setTenantId(super.getTenantId());


+ 8
- 2
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java Просмотреть файл

@@ -460,9 +460,12 @@ public class WxCUserBasicInfoController extends BaseController {
@ApiOperation("根据手机号查询接口")
@GetMapping("/findByPhone")
@ApiImplicitParam(name = "phone", value = "phone", dataType = "String", paramType = "query", required = true)
@SystemControllerLog(description = "根据手机号查询接口")
@SystemControllerLog(description = "会员管理-根据手机号查询接口")
public ResultData findByPhone(String phone) {
logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::findByPhone");
if (StringUtils.isEmpty(phone)) {
return new ResultData(new ArrayList<WxCUserBasicInfo>());
}
List<WxCUserBasicInfo> wxCUserBasicInfoList = wxCUserBasicInfoService.findByPhone(getTenantId(),phone);
WxCUserBasicInfo wxCUserBasicInfo = new WxCUserBasicInfo();
if (wxCUserBasicInfoList != null && wxCUserBasicInfoList.size() > 0) {
@@ -473,14 +476,16 @@ public class WxCUserBasicInfoController extends BaseController {

@ApiOperation("获取会员过滤器")
@GetMapping("/listFilter")
@SystemControllerLog(description = "会员管理-获取会员过滤器")
public ResultData listFilter() {
logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::listFilter");
return new ResultData(wxCUserBasicInfoService.listFilters(getTenantId()));
}


@ApiOperation("获取会员过滤器")
@ApiOperation("会员过滤器获取数量")
@PostMapping("/countByFilter")
@SystemControllerLog(description = "会员管理-会员过滤器获取数量")
public ResultData countByFilter(@RequestBody List<WxCUserBasicInfoFilterDto> filterList) {
logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::listFilter");
return new ResultData(wxCUserBasicInfoService.countByFilter(getTenantId(),filterList));
@@ -488,6 +493,7 @@ public class WxCUserBasicInfoController extends BaseController {

@ApiOperation("获取会员过滤器")
@PostMapping("/listByFilter")
@SystemControllerLog(description = "会员管理-会员过滤器获取")
public ResultData listByFilter(@RequestParam List<WxCUserBasicInfoFilterDto> filterList) {
logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::listFilter");
return new ResultData(wxCUserBasicInfoService.listByFilter(getTenantId(),filterList));


+ 23
- 18
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java Просмотреть файл

@@ -1,6 +1,7 @@
package com.iformall.controller.mem;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
@@ -19,18 +20,18 @@ import org.springframework.web.bind.annotation.*;

@RestController
@RequestMapping("wxCreditHistory")
public class WxCreditHistoryController extends BaseController
{
@Autowired
public class WxCreditHistoryController extends BaseController {
@Autowired
private WxCreditHistoryService wxCreditHistoryService;

private final Logger logger = LoggerFactory.getLogger(this.getClass());
@ApiOperation("分页列表接口")
@ApiOperation("分页列表接口")
@GetMapping("list")
@ApiImplicitParams({
@ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true),
@ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)})
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
@SystemControllerLog(description = "积分历史-列表")
public ResultData list(@ModelAttribute WxCreditHistory wxCreditHistory, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::list");
if (null == wxCreditHistory) wxCreditHistory = new WxCreditHistory();
@@ -41,15 +42,17 @@ public class WxCreditHistoryController extends BaseController
@ApiOperation("根据商户ID和消费金额获取所增加积分 取data里credit的值")
@GetMapping("findByMerchantIdAndSpend")
@ApiImplicitParams({
@ApiImplicitParam(name="merchantId",value="商户ID",dataType="long", paramType = "query",required=true),
@ApiImplicitParam(name="spend",value="消费金额",dataType="int", paramType = "query",required=true)})
@ApiImplicitParam(name = "merchantId", value = "商户ID", dataType = "long", paramType = "query", required = true),
@ApiImplicitParam(name = "spend", value = "消费金额", dataType = "int", paramType = "query", required = true)})
@SystemControllerLog(description = "积分历史-根据商户ID和消费金额获取所增加积分")
public ResultData findByMerchantIdAndSpend(@RequestParam Long merchantId, @RequestParam String spendStr) {
logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::findByMerchantIdAndSpend");
return new ResultData(wxCreditHistoryService.findByMerchantIdAndSpend(merchantId,spendStr,getTenantId()));
return new ResultData(wxCreditHistoryService.findByMerchantIdAndSpend(merchantId, spendStr, getTenantId()));
}

@ApiOperation("新增接口")
@ApiOperation("新增接口")
@PostMapping("add")
@SystemControllerLog(description = "积分历史-新增接口")
public ResultData add(@RequestBody WxCreditHistory wxCreditHistory) {
logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::add");
MallUserInfo user = getUser();
@@ -64,19 +67,21 @@ public class WxCreditHistoryController extends BaseController
}
}

@ApiOperation("根据id查询接口")
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
@ApiOperation("根据id查询接口")
@GetMapping("/findById")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
@SystemControllerLog(description = "积分历史-查询")
public ResultData findById(Long id) {
logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::findById");
return new ResultData(Result.SUCCESS,"查询成功",wxCreditHistoryService.getById(id));
logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::findById");
return new ResultData(Result.SUCCESS, "查询成功", wxCreditHistoryService.getById(id));
}

/**
* 根据A端设置的【每自然年末扣除前N年用户积分】规则,扣减用户积分
*
* @return
*/
public ResultData clearCreditByYear(){
public ResultData clearCreditByYear() {
logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::clearCreditByYear");
wxCreditHistoryService.clearCreditByYear();
return new ResultData(Result.SUCCESS);


+ 6
- 0
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java Просмотреть файл

@@ -1,5 +1,6 @@
package com.iformall.controller.mem;

import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode;
import com.iformall.controller.base.BaseController;
import org.slf4j.Logger;
@@ -39,6 +40,7 @@ public class WxLevelConfigController extends BaseController {
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
@SystemControllerLog(description = "会员等级权益-列表")
public ResultData list(@ModelAttribute WxLevelConfig wxLevelConfig, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxLevelConfigController::list");
if (null == wxLevelConfig) wxLevelConfig = new WxLevelConfig();
@@ -50,6 +52,7 @@ public class WxLevelConfigController extends BaseController {

@ApiOperation("新增接口")
@PostMapping("add")
@SystemControllerLog(description = "会员等级权益-新增")
public ResultData add(@RequestBody List<WxLevelConfig> levelConfigs) {
logger.debug("[" + getIpAddr() + "] WxLevelConfigController::add");
String tenantId = getTenantId();
@@ -64,6 +67,7 @@ public class WxLevelConfigController extends BaseController {

@ApiOperation("更改会员权益")
@PostMapping("updateCapabilities")
@SystemControllerLog(description = "会员等级权益-更改会员权益")
public ResultData updateCapabilities(@RequestBody List<WxLevelConfig> levelConfigs) {
logger.debug("[" + getIpAddr() + "] WxLevelConfigController::add");
String tenantId = getTenantId();
@@ -78,6 +82,7 @@ public class WxLevelConfigController extends BaseController {

@ApiOperation("根据id删除接口")
@PostMapping("/del")
@SystemControllerLog(description = "会员等级权益-删除")
public ResultData delete(@RequestBody WxLevelConfig wxLevelConfig) {
logger.debug("[" + getIpAddr() + "] WxLevelConfigController::delete");
wxLevelConfigService.deleteById(wxLevelConfig.getId());
@@ -87,6 +92,7 @@ public class WxLevelConfigController extends BaseController {
@ApiOperation("根据id查询接口")
@GetMapping("/findById")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
@SystemControllerLog(description = "会员等级权益-获取")
public ResultData findById(Long id) {
logger.debug("[" + getIpAddr() + "] WxLevelConfigController::findById");
return new ResultData(Result.SUCCESS, "查询成功", wxLevelConfigService.getById(id));


+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxUserChannelController.java Просмотреть файл

@@ -1,6 +1,7 @@
package com.iformall.controller.mem;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
@@ -26,6 +27,7 @@ public class WxUserChannelController extends BaseController {
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
@SystemControllerLog(description = "会员等级权益-更改会员权益")
public ResultData list(@ModelAttribute WxUserChannel wxUserChannel, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxUserChannelController::list");
if (null == wxUserChannel) wxUserChannel = new WxUserChannel();


+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java Просмотреть файл

@@ -84,6 +84,7 @@ public class WxMsgController extends BaseController {


@RequestMapping("/excleupload")
@SystemControllerLog(description = "标签短信-导出")
public ResultData excleupload(@RequestParam("file") MultipartFile file) {
logger.debug("[" + getIpAddr() + "] WxMsgController::excleupload");
if (file.isEmpty()) {


+ 10
- 5
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java Просмотреть файл

@@ -12,10 +12,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -134,7 +131,7 @@ public class WxBillAllController extends BaseController {


@GetMapping("exportOweBill")
@SystemControllerLog(description = "生成催缴单")
@SystemControllerLog(description = "费用收缴数据-生成催缴单")
public void exportOweBill(@ModelAttribute WxBillAll wxBillAll, HttpServletRequest request, HttpServletResponse response) {
logger.debug("[" + getIpAddr() + "] WxBillAllController::exportOweBill");
if (null == wxBillAll) {
@@ -148,4 +145,12 @@ public class WxBillAllController extends BaseController {
wxBillAllService.exportOweBill(wxBillAll, request, response);
}

@PostMapping("updateReceivePay")
@SystemControllerLog(description = "账单-更新")
public ResultData updateReceivePay(@RequestBody WxBillAll wxBillAll) {
logger.debug("[" + getIpAddr() + "] WxBillRentController::add");
wxBillAll.setTenantId(getTenantId());
return wxBillAllService.updateReceivePay(wxBillAll, getUser());
}

}

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java Просмотреть файл

@@ -121,7 +121,7 @@ public class WxBillDailyController extends BaseController {
}

@PostMapping(value = "/importTemplate", consumes = "multipart/*")
@SystemControllerLog(description = "会员管理-导入数据")
@SystemControllerLog(description = "日常账单-导入数据")
public ResultData importTemplate(@RequestParam("file") MultipartFile mFile) {
logger.debug("[" + getIpAddr() + "] wxBillDailyService::importTemplate");
if (mFile.isEmpty()) {


+ 7
- 7
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java Просмотреть файл

@@ -44,7 +44,7 @@ public class WxBillOtherDepositController extends BaseController {
}

@PostMapping("add")
@SystemControllerLog(description = "其它账单-新增")
@SystemControllerLog(description = "其它押金账单-新增")
public ResultData add(@RequestBody WxBillOtherDeposit wxBillOtherDeposit) {
logger.debug("[" + getIpAddr() + "] WxBillOtherDepositController::add");
MallUserInfo user = getUser();
@@ -54,7 +54,7 @@ public class WxBillOtherDepositController extends BaseController {
}

@PostMapping("update")
@SystemControllerLog(description = "其它账单-更新")
@SystemControllerLog(description = "其它押金账单-更新")
public ResultData update(@RequestBody WxBillOtherDeposit wxBillOtherDeposit) {
logger.debug("[" + getIpAddr() + "] WxBillOtherDepositController::update");
MallUserInfo user = getUser();
@@ -64,7 +64,7 @@ public class WxBillOtherDepositController extends BaseController {

@GetMapping("/del")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
@SystemControllerLog(description = "其它账单-删除")
@SystemControllerLog(description = "其它押金账单-删除")
public ResultData delete(Long id) {
logger.debug("[" + getIpAddr() + "] WxBillOtherDepositController::delete");
wxBillOtherDepositService.deleteById(id);
@@ -73,7 +73,7 @@ public class WxBillOtherDepositController extends BaseController {

@GetMapping("/findById")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
@SystemControllerLog(description = "其它账单-查询")
@SystemControllerLog(description = "其它押金账单-查询")
public ResultData findById(Long id) {
logger.debug("[" + getIpAddr() + "] WxBillOtherDepositController::findById");
return new ResultData(Result.SUCCESS, "查询成功", wxBillOtherDepositService.getById(id));
@@ -81,14 +81,14 @@ public class WxBillOtherDepositController extends BaseController {

@GetMapping("/updatePaid")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
@SystemControllerLog(description = "其它账单-支付更新")
@SystemControllerLog(description = "其它押金账单-支付更新")
public ResultData updatePaid(Long id) {
logger.debug("[" + getIpAddr() + "] WxBillOtherDepositController::updatePaid");
return wxBillOtherDepositService.updatePaid(id);
}

@PostMapping("returnDeposit")
@SystemControllerLog(description = "其它账单-退回押金")
@SystemControllerLog(description = "其它押金账单-退回押金")
public ResultData returnDeposit(@RequestBody WxBillOtherDeposit wxBillDeposit) {
logger.debug("[" + getIpAddr() + "] WxBillOtherDepositController::returnDeposit");
return wxBillOtherDepositService.returnDeposit(wxBillDeposit, getUser());
@@ -96,7 +96,7 @@ public class WxBillOtherDepositController extends BaseController {
}

@PostMapping("adjustDeposit")
@SystemControllerLog(description = "其它账单-调整押金")
@SystemControllerLog(description = "其它押金账单-调整押金")
public ResultData adjustDeposit(@RequestBody WxBillOtherDeposit wxBillDeposit) {
logger.debug("[" + getIpAddr() + "] WxBillOtherDepositController::adjustDeposit");
return wxBillOtherDepositService.adjustDeposit(wxBillDeposit);


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java Просмотреть файл

@@ -107,7 +107,7 @@ public class WxBillPropertyController extends BaseController {


@PostMapping("updateLatePayStatus")
@SystemControllerLog(description = "租赁账单-滞纳金结单")
@SystemControllerLog(description = "物业账单-滞纳金结单")
public ResultData updateLatePayStatus(@RequestBody WxBillProperty wxBillProperty) {
logger.debug("[" + getIpAddr() + "] WxBillPropertyController::updateLatePayStatus");
return wxBillPropertyService.updateLatePayStatus(wxBillProperty);


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java Просмотреть файл

@@ -112,7 +112,7 @@ public class WxBillRentController extends BaseController {


@PostMapping("updateLatePayStatus")
@SystemControllerLog(description = "租赁账单-滞纳金结单")
@SystemControllerLog(description = "租赁押金账单-滞纳金结单")
public ResultData updateLatePayStatus(@RequestBody WxBillRent wxBillRent) {
logger.debug("[" + getIpAddr() + "] WxBillRentController::updateLatePayStatus");
return wxBillRentService.updateLatePayStatus(wxBillRent);


+ 43
- 0
mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserActionController.java Просмотреть файл

@@ -0,0 +1,43 @@
package com.iformall.controller.sys;

import com.github.pagehelper.PageInfo;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.vo.MallUserActionVo;
import com.iformall.service.MallUserActionService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@RestController
@RequestMapping("mallUserAction")
public class MallUserActionController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired
private MallUserActionService mallUserActionService;

@ApiOperation("分页列表接口")
@GetMapping("list")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
public ResultData list(@ModelAttribute MallUserActionVo userAction, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] MallUserActionController::list");
if (null == userAction) {
userAction = new MallUserActionVo();
} else {
if(StringUtils.isBlank(userAction.getName())) {
userAction.setName(null);
}
}
final PageInfo<MallUserActionVo> page = mallUserActionService.listAsPage(userAction, pageNum, pageSize);
return new ResultData(page);
}


}

+ 2
- 19
mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java Просмотреть файл

@@ -193,7 +193,6 @@ public class MallUserInfoController extends BaseController {
currentUser.getId().equals(userInfo.getId())) {
// 超管
MallUserInfo adminUser = new MallUserInfo();
adminUser.setFlowPermission(userInfo.getFlowPermission());
adminUser.setEmail(userInfo.getEmail());
adminUser.setId(userInfo.getId());
if (StringUtils.isNotBlank(userInfo.getPassword()) && userInfo.getPassword().length() > 0) {
@@ -294,7 +293,7 @@ public class MallUserInfoController extends BaseController {
@ApiOperation(value = "用户权限检查")
@GetMapping("getUser")
//@RequiresPermissions("sys:user:info")
//@SystemControllerLog(description = "用户管理-用户信息")
@SystemControllerLog(description = "用户管理-获取用户信息")
public ResultData getUserInfo() {
///logger.debug("[" + getIpAddr() + "] MallUserInfoController::getUserInfo");
MallUserInfo info = getUser();
@@ -337,6 +336,7 @@ public class MallUserInfoController extends BaseController {

@ApiOperation(value = "修改密码", notes = "{\"userName\",\"string\",\"code\",\"string\",\"pwd\",\"string\"}")
@PostMapping("/updatepwd")
@SystemControllerLog(description = "用户管理-修改密码")
public ResultData updatepwd(@RequestBody Map<String, String> params) {
logger.debug("[" + getIpAddr() + "] MallUserInfoController::updatepwd");
// String phone,String code,String pwd
@@ -375,22 +375,5 @@ public class MallUserInfoController extends BaseController {
}
}

@ApiOperation(value = "审批权限用户列表", response = String.class)
@GetMapping("getFlowPermissionList")
//@RequiresPermissions("sys:user:flowlist")
@SystemControllerLog(description = "用户管理-审批权限用户列表")
public ResultData getFlowPermissionList() {
logger.debug("[" + getIpAddr() + "] MallUserInfoController::getFlowPermissionList");
MallUserInfo mallUserInfo = new MallUserInfo();
mallUserInfo.setFlowPermission(EnumFlowPermissionType.CONTRACT.getCode()+"");
List<MallUserInfo> contractUserList = userInfoService.findList(mallUserInfo);

mallUserInfo.setFlowPermission(EnumFlowPermissionType.BILL.getCode()+"");
List<MallUserInfo> billUserList = userInfoService.findList(mallUserInfo);
Map<String,Object> resultMap = new HashedMap();
resultMap.put("contractUserList",contractUserList);
resultMap.put("billUserList",billUserList);
return new ResultData(resultMap);
}

}

+ 5
- 4
mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java Просмотреть файл

@@ -52,6 +52,7 @@ public class SysMenuController extends BaseController {

@ApiOperation("导航菜单")
@GetMapping("/nav")
@SystemControllerLog(description = "菜单-导航菜单")
public ResultData nav(){
logger.debug("[" + getIpAddr() + "] MallPermissionController::nav");
MallUserInfo user = getUser();
@@ -66,7 +67,7 @@ public class SysMenuController extends BaseController {
@ApiOperation("所有菜单列表")
@GetMapping("list")
//@RequiresPermissions("sys:menu:list")
@SystemControllerLog(description = "用户管理-权限")
@SystemControllerLog(description = "菜单-所有菜单列表")
public ResultData getList() {
logger.debug("[" + getIpAddr() + "] MallPermissionController::list");
MallUserInfo user = getUser();
@@ -81,7 +82,7 @@ public class SysMenuController extends BaseController {
@ApiOperation("菜单信息")
@GetMapping("/findById")
//@RequiresPermissions("sys:menu:info")
@SystemControllerLog(description = "用户管理-权限查找")
@SystemControllerLog(description = "菜单-权限查找")
public ResultData findById(Long id) {
logger.debug("[" + getIpAddr() + "] MallPermissionController::findById");
return new ResultData(Result.SUCCESS, "成功", mallPermissionService.getById(id));
@@ -90,7 +91,7 @@ public class SysMenuController extends BaseController {
@ApiOperation("获取父子菜单ID信息")
@GetMapping("/getMenuIdsById")
//@RequiresPermissions("sys:menu:info")
@SystemControllerLog(description = "用户管理-父子菜单查找")
@SystemControllerLog(description = "菜单-父子菜单查找")
public ResultData getMenuIdsById(Long parentId) {
logger.debug("[" + getIpAddr() + "] MallPermissionController::getMenusById");
MallUserInfo user = getUser();
@@ -100,7 +101,7 @@ public class SysMenuController extends BaseController {
@ApiOperation("获取父子菜单信息")
@GetMapping("/getMenusById")
//@RequiresPermissions("sys:menu:info")
@SystemControllerLog(description = "用户管理-父子菜单查找")
@SystemControllerLog(description = "菜单-父子菜单查找")
public ResultData getMenusById(Long parentId) {
logger.debug("[" + getIpAddr() + "] MallPermissionController::getMenusById");
MallUserInfo user = getUser();


+ 4
- 0
mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java Просмотреть файл

@@ -9,6 +9,7 @@ import com.amazonaws.auth.BasicAWSCredentials;
import com.amazonaws.services.s3.AmazonS3;
import com.amazonaws.services.s3.AmazonS3ClientBuilder;
import com.amazonaws.services.s3.model.*;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ResultData;
import com.iformall.config.AwsProperty;
import com.iformall.controller.base.BaseController;
@@ -125,6 +126,7 @@ public class UploadController extends BaseController {
*/
@PostMapping(value = "/awsFileUpload", consumes = "multipart/*", headers = "content-type=multipart/form-data")
@ApiOperation("上传文件")
@SystemControllerLog(description = "文件上传")
public ResultData awsfileUpload(@RequestParam("file") MultipartFile multiReq) throws Exception{
logger.info("[" + getIpAddr() + "] UploadController::awsfileUpload");

@@ -159,6 +161,7 @@ public class UploadController extends BaseController {
*/
@PostMapping(value = "/awsImgUpload", consumes = "multipart/*", headers = "content-type=multipart/form-data")
@ApiOperation("上传图片")
@SystemControllerLog(description = "上传图片")
public ResultData awsImgUpload(@RequestParam("file") MultipartFile multiReq) throws Exception{
logger.info("[" + getIpAddr() + "] UploadController::awsImgUpload");

@@ -222,6 +225,7 @@ public class UploadController extends BaseController {
*/
@PostMapping(value = "/awsFilesUpload", consumes = "multipart/*", headers = "content-type=multipart/form-data")
@ApiOperation("多文件上传")
@SystemControllerLog(description = "多文件上传")
public ResultData awsFilesUpload(@RequestParam("files") MultipartFile[] files) throws Exception{
logger.info("[" + getIpAddr() + "] UploadController::awsFilesUpload");



+ 3
- 0
mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java Просмотреть файл

@@ -1,6 +1,7 @@
package com.iformall.controller.sys;

import com.alibaba.fastjson.JSON;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
@@ -322,6 +323,7 @@ public class WechatLoginController extends BaseController {

@ApiOperation(value = "微信第三方登录绑定", notes = "请配置此callback到网页redirect_uri")
@GetMapping("bindWebOpenId")
@SystemControllerLog(description = "微信第三方登录绑定")
public void userBindWebOpenId(String code, String state, HttpServletRequest request, HttpServletResponse response) {
log.debug("[" + getIpAddr() + "] WechatLoginController::bindWebOpenId");
String host = request.getHeader("host");
@@ -368,6 +370,7 @@ public class WechatLoginController extends BaseController {

@ApiOperation(value = "微信第三方登录解绑", notes = "请配置此callback到网页redirect_uri")
@GetMapping("cleanWebOpenId")
@SystemControllerLog(description = "微信第三方登录解绑")
public ResultData cleanWebOpenId(@ModelAttribute MallUserInfo userInfo) {
log.debug("[" + getIpAddr() + "] WechatLoginController::cleanWebOpenId");
MallUserInfo user = getUser();


+ 108
- 24
mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java Просмотреть файл

@@ -5,6 +5,8 @@ import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.WxFlowConfig;
import com.iformall.domain.po.WxFlowModel;
import com.iformall.domain.po.WxFlowRecord;
import com.iformall.enums.EnumFlowRecordStatus;
import com.iformall.service.WxFlowService;
@@ -12,12 +14,12 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.*;

@RestController
@@ -28,8 +30,6 @@ public class WxFlowAbleController extends BaseController {

@Autowired
private WxFlowService wxFlowService;
// @Autowired
// RuntimeService runtimeService;

@ApiOperation(value = "启动流程",notes = "{\"businessId\":\"221178539888607232\",\"businessType\":1,\"remark\":\"意见意见。\",\"taskAssignee\":[{\"taskKey\":\"firstTaskUser\",\"assignee\":\"243650055783841792\"},{\"taskKey\":\"secondTaskUser\",\"assignee\":\"\"}],\"variables\":[{\"key\":\"contractType\",\"value\":\"1\"},{\"key\":\"contractNumber\",\"value\":\"1111\"}]}")
@PostMapping("/start")
@@ -40,19 +40,6 @@ public class WxFlowAbleController extends BaseController {
return wxFlowService.start(params, user.getId(),user.getName(),user.getTenantId());
}

/**
* 删除流程
*/
// @GetMapping(value = "/del")
// public ResultData del(String id,String x) {
// if("xll1dxx1314".equals(x)) {
// runtimeService.deleteProcessInstance(id, "驳回");
// return new ResultData();
// }else{
// return new ResultData("fail");
// }
// }

/**
* 用户代办列表
*/
@@ -66,7 +53,7 @@ public class WxFlowAbleController extends BaseController {
@SystemControllerLog(description = "工作流-用户代办列表")
public ResultData list(String flowType,Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] FlowAbleController::list");
return wxFlowService.list(flowType,pageNum,pageSize,getUserId());
return wxFlowService.list(flowType,pageNum,pageSize,getUserId(),getTenantId());
}

/**
@@ -180,21 +167,118 @@ public class WxFlowAbleController extends BaseController {
return wxFlowService.setBack(params,user.getId(),user.getName());
}


/**
* 创建模板
*/
@ApiOperation(value = "创建模板")
@PostMapping(value = "createModel")
@SystemControllerLog(description = "工作流-创建模板")
public ResultData createModel(@RequestBody WxFlowModel wxFlowModel) {
wxFlowModel.setTenantId(getTenantId());
wxFlowModel.setCreateUser(getUserId());
return wxFlowService.createModel(wxFlowModel);
}

/**
* 生成流程图
*
* 根据id查询模板
*/
@GetMapping(value = "processDiagram")
@ApiOperation(value = "根据id查询模板",notes = "")
@GetMapping(value = "findModelById")
@SystemControllerLog(description = "工作流-根据id查询模板")
public ResultData findById(@ModelAttribute WxFlowModel wxFlowModel){
wxFlowModel.setTenantId(getTenantId());
return wxFlowService.findModelById(wxFlowModel);
}

/**
* 删除模板
*/
@ApiOperation(value = "删除模板")
@PostMapping(value = "delModel")
@SystemControllerLog(description = "工作流-删除模板")
public ResultData delModel(@RequestBody WxFlowModel wxFlowModel) {
wxFlowModel.setTenantId(getTenantId());
return wxFlowService.delModel(wxFlowModel);
}

/**
* 模板列表
*/
@ApiOperation("模板列表")
@GetMapping(value = "/modelList")
@ApiImplicitParams({
@ApiImplicitParam(name = "businessId", value = "业务id", dataType = "String", paramType = "query", required = true)
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true),
})
@SystemControllerLog(description = "工作流-生成流程图")
public void genProcessDiagram(HttpServletResponse httpServletResponse, String businessId) throws Exception {
wxFlowService.genProcessDiagram(httpServletResponse,businessId);
@SystemControllerLog(description = "工作流-模板列表")
public ResultData modelList(@ModelAttribute WxFlowModel wxFlowModel,Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] FlowAbleController::modelList");
wxFlowModel.setTenantId(getTenantId());
return new ResultData(wxFlowService.modelList(wxFlowModel,pageNum,pageSize));
}

/**
* 根据业务查询模板
*/
@ApiOperation("根据业务查询模板")
@GetMapping(value = "/getModelBybusiness")
@SystemControllerLog(description = "工作流-模板列表")
public ResultData getModelBybusiness(@ModelAttribute WxFlowModel wxFlowModel) {
logger.debug("[" + getIpAddr() + "] FlowAbleController::getModelBybusiness");
wxFlowModel.setTenantId(getTenantId());
return new ResultData(wxFlowService.getModelBybusiness(wxFlowModel));
}


/**
* 配置列表
*/
@ApiOperation("配置列表")
@GetMapping(value = "/configList")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true),
})
@SystemControllerLog(description = "工作流-配置列表")
public ResultData configList(@ModelAttribute WxFlowConfig wxFlowConfig, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] FlowAbleController::modelList");
wxFlowConfig.setTenantId(getTenantId());
if(pageSize == null){
pageSize = Integer.MAX_VALUE;
}
if(pageNum == null){
pageNum = 1;
}

wxFlowConfig.setParentId(0l);
PageInfo<WxFlowConfig> pageInfo = wxFlowService.configList(wxFlowConfig,pageNum,pageSize);
List<WxFlowConfig> list = pageInfo.getList();
for (WxFlowConfig c:list) {
if(CollectionUtils.isNotEmpty(c.getChilds())){
for (WxFlowConfig ch:c.getChilds()) {
if(ch.getModelId() != null){
WxFlowModel query = new WxFlowModel();
query.setId(ch.getModelId());
ch.setWxFlowModel((WxFlowModel)wxFlowService.findModelById(query).data);
}
}
}
}
pageInfo.setList(list);
return new ResultData(pageInfo);
}

/**
* 类型设置
*/
@ApiOperation(value = "类型设置")
@PostMapping(value = "updateConfig")
@SystemControllerLog(description = "工作流-类型设置")
public ResultData updateConfig(@RequestBody WxFlowConfig wxFlowConfig) {
wxFlowConfig.setTenantId(getTenantId());
return wxFlowService.updateConfig(wxFlowConfig);
}


}

+ 12
- 0
mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java Просмотреть файл

@@ -88,6 +88,18 @@ public class TenantInfoImpl implements TenantInfo {
return true;
if ("com.iformall.mapper.WxShopMapper.rentRateHistory".equals(ms.getId()))
return true;
if ("com.iformall.mapper.WxLevelConfigMapper.insertBatch".equals(ms.getId()))
return true;
if ("com.iformall.mapper.WxLevelConfigMapper.batchUpdate".equals(ms.getId()))
return true;
if ("com.iformall.mapper.WxBillRentMapper.updateBills".equals(ms.getId()))
return true;
if ("com.iformall.mapper.WxBillPropertyMapper.updateBills".equals(ms.getId()))
return true;
if ("com.iformall.mapper.WxActivityJoinMapper.updateSendMsg".equals(ms.getId()))
return true;
if ("com.iformall.mapper.WxActivityJoinMapper.updateStatus".equals(ms.getId()))
return true;
return false;
}
}

+ 1
- 1
mallinkAdmin/src/main/resources/application-dev.yml Просмотреть файл

@@ -3,7 +3,7 @@ spring:
include: rabbitMQ
# JDBC
datasource:
url: jdbc:mysql://202.165.179.86:3306/mallinkDev?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true
url: jdbc:mysql://202.165.179.86:3306/mallinkDev?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true&allowMultiQueries=true
username: ENC(dZ8fmrtuBMQYaRytKQgTqg==)
password: ENC(IKH7HxMZwIqMttMc9+QsqWa1KMsJvTs4)
type: com.alibaba.druid.pool.DruidDataSource


+ 1
- 1
mallinkAdmin/src/main/resources/application-prod.yml Просмотреть файл

@@ -3,7 +3,7 @@ spring:
include: rabbitMQ
# JDBC
datasource:
url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallink?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true
url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallink?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true&allowMultiQueries=true
username: ENC(NUzgQOdJnCbVLKT6BaX0aw==)
password: ENC(mvuoDRiu0jqYaKNRwwTuXZ6U7aoIaqsjdiPqTLgi/nY=)
type: com.alibaba.druid.pool.DruidDataSource


+ 1
- 1
mallinkAdmin/src/main/resources/application-test.yml Просмотреть файл

@@ -3,7 +3,7 @@ spring:
include: rabbitMQ
# JDBC
datasource:
url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallinkTest?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true
url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallinkTest?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true&allowMultiQueries=true
username: ENC(Uc0AjgkytxHHCwZrmDASWg==)
password: ENC(nV4Mi3bEbBx0Fj7uUyYH55eTaqsFMjKvmNzagicH4pc=)
type: com.alibaba.druid.pool.DruidDataSource


+ 0
- 4
mallinkAdmin/src/main/resources/db/migration/V201905061341__L_VAL_MSG_MODEL.sql Просмотреть файл

@@ -1,4 +0,0 @@
alter table `wx_msg_validationcode_model` modify column content text;

ALTER TABLE `wx_msg_validationcode_model`
ADD COLUMN `email_bg_img` varchar(300) DEFAULT NULL COMMENT '邮箱背景图片';

+ 0
- 4
mallinkAdmin/src/main/resources/db/migration/V201905061350__ADD_COLUMN_ACTIVE_TIME.sql Просмотреть файл

@@ -1,4 +0,0 @@
ALTER TABLE wx_c_user
ADD COLUMN active_time DATETIME DEFAULT NULL COMMENT '最后一次活跃时间';
ALTER TABLE wx_c_user_basic_info
ADD COLUMN active_time DATETIME DEFAULT NULL COMMENT '最后一次活跃时间';

+ 0
- 78
mallinkAdmin/src/main/resources/db/migration/V201905061425__L_VAL_MSG_MODEL_DATA.sql Просмотреть файл

@@ -1,78 +0,0 @@
INSERT INTO `wx_msg_validationcode_model` (`id`,`type`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`)
VALUES
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),10,'789', '审批通过通知', '富茂', '<html><head><meta charset=\"utf-8\"><meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\"><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" /><meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" /><meta name=\"renderer\" content=\"webkit\"><meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\"><title>富茂审批邮件</title><title></title><script> document.documentElement.style.fontSize = document.documentElement.clientWidth / 7.5 + \'px\';</script></head><body><div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\"><header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\"><img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/></header><div style=\"background:#fff;padding:0 0 40px 0;box-sizing: border-box;\"><div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;\">审批通过通知</div><div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding-left: 55px;padding: 36px 55px;\">编号<span>{contract}</span>的{bustype}已经审批通过,请登录<a href=\"{page}\">{page}</a>跟进后续工作</div></div></div></body></html>', '2018-09-29 16:03:11', 1, 1, 'http://202.165.179.86:8081/images/WechatIMG5130.png'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),11, '789', '待缴账单通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <style>\n *{\n margin: 0;\n padding: 0;\n }\n </style>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/>\n </header>\n <content>\n <div style=\"background: #fff;padding-bottom: 40px;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding-top: 56px;padding-left: 55px;\">待缴账单通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding:36px 55px 0;\">您当前的待缴账单为<span style=\"font-weight:400;color:rgba(200,89,98,1);margin:0 10px;\">{price}</span>元,截止日期为<span>{date}</span>请登录<span>您的商户端</span>小程序查看账单并缴费</div>\n </div>\n <div style=\"height: auto;width: 100%;line-height: 40px; background: rgba(245,245,245,1);padding: 30px 0;\">\n <div style=\"overflow: hidden;\">\n <span style=\"display: block; font-size:18px;width:80px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">租金账单</span>\n <div style=\"margin: 0 5%;width:90%;overflow: hidden;\">\n <div style=\"width: 33.3%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">账单类型</div>\n <div style=\"width: 33.3%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">账单金额(元)</div>\n <div style=\"width: 33.3%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">缴费时间</div>\n </div>\n {billList}\n </div>\n </div>\n <div style=\"background: #fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold; font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;margin-top: 26px;margin-left: 55px;padding-top: 56px;\">遇到问题?</div>\n <div style=\"overflow: hidden;line-height: 60px;padding-bottom: 40px;\">\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">请联系商管负责人:</span>\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 25px;\"><span>{linkName}</span><span style=\"margin-left: 16px; font-family:MicrosoftYaHei;font-weight:400;color:rgba(64,103,139,1);\">{linkPhone}</span></span>\n </div>\n </div>\n </content>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 2, 'http://202.165.179.86:8081/images/WechatIMG5130.png'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),12, '789', '审批通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <script> document.documentElement.style.fontSize = document.documentElement.clientWidth / 7.5 + \'px\';</script>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;padding:0 40px;\" src=\"{bg}\"/>\n </header>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding:56px 55px 0;\">审批通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding: 36px 55px;\"><span>{userName}</span>同意编号<span>{contract}</span>的{bustype}审批,已呈送<span>{toUserName},</span>请登录<a href=\"{page}\">{page}</a>查看审批进度</div>\n </div>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 3, 'http://202.165.179.86:8081/images/WechatIMG5130.png'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),13, '789', '欠缴账单通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <style>\n *{\n margin: 0;\n padding: 0;\n }\n </style>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/>\n </header>\n <content>\n <div style=\"background: #fff;padding-bottom: 40px;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;\">欠缴账单通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding: 36px 55px 0;\">您当前的欠缴账单为<span style=\"font-weight:400;color:rgba(200,89,98,1);margin:0 10px;\">{price}</span>元,截止日期为<span>{date}</span>请登录<span>您的商户端</span>小程序查看账单并缴费</div>\n </div>\n <div style=\"height: auto;width: 100%;line-height: 40px; background: rgba(245,245,245,1);padding: 30px 0;\">\n <div style=\"overflow: hidden;\">\n <span style=\"display: block; font-size:18px;width:80px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">租金账单</span>\n <div style=\"margin: 0 5%;width:90%;overflow: hidden;font-size:14px;\">\n <div style=\"width: 25%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">账单类型</div>\n <div style=\"width: 25%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">账单金额(元)</div>\n <div style=\"width: 25%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">缴费时间</div>\n <div style=\"width: 25%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">逾期天数</div>\n </div>\n {billList}\n </div>\n </div>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold; font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;margin-top: 26px;margin-left: 55px;padding-top: 56px;\">遇到问题?</div>\n <div style=\"overflow: hidden;line-height: 60px;padding-bottom: 40px;\">\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">请联系商管负责人:</span>\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 25px;\"><span>{linkName}</span><span style=\"margin-left: 16px; font-family:MicrosoftYaHei;font-weight:400;color:rgba(64,103,139,1);\">{linkPhone}</span></span>\n </div>\n </div>\n </content>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 4, 'http://202.165.179.86:8081/images/WechatIMG5130.png'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),14, '789', '待办通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <style>\n *{\n margin: 0;\n padding: 0;\n }\n </style>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/>\n </header>\n <content>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;\">待办通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding: 36px 55px 40px;\"><span>{name}</span><span>提交了一个{bustype}待您审批,电脑登录</span><a href=\"{page}\" target=\"_blank\">{page}</a>查看您的待办</div>\n </div>\n <div style=\"height: auto;width: 100%;line-height: 40px; background: rgba(245,245,245,1);padding: 30px 0;\">\n <div style=\"overflow: hidden;\">\n <div style=\"float: left;font-size:18px;width:cale(20%-55px);font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">申请时间:</div>\n <div style=\"float: left;font-size:18px;width:cale(80%-55px);font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 55px;\">{applyTime}</div>\n </div>\n <div style=\"overflow: hidden;\">\n <div style=\"float: left;font-size:18px;width:cale(20%-55px);font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">申请进度:</div>\n <div style=\"float: left;width:cale(80%-55px);margin-left: 55px;\">\n \n {taskList}\n </div>\n </div>\n </div>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;margin-top: 26px;padding: 56px 55px 0;\">遇到问题?</div>\n <div style=\"overflow: hidden;line-height: 60px;padding-bottom: 40px;\">\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">请联系申请人:</span>\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 25px;\"><span>{linkName}</span><span style=\"margin-left: 16px; font-family:MicrosoftYaHei;font-weight:400;color:rgba(64,103,139,1);\">{linkPhone}</span></span>\n </div>\n </div>\n </content>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 5, 'http://202.165.179.86:8081/images/WechatIMG5130.png'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),15, '789', '驳回通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <style>\n *{\n margin: 0;\n padding: 0;\n }\n </style>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/>\n </header>\n <content>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;\">审批通过通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding:36px 55px 40px;\">编号<span>{contract}</span>的{bustype}审批被驳回,请登录<a href=\"{page}\">{page}</a>查看审批明细</div>\n </div>\n <div style=\"height: auto;width: 100%;line-height: 40px; background: rgba(245,245,245,1);padding: 30px 0;\">\n <div style=\"overflow: hidden;\">\n <span style=\"display: block;float: left; font-size:18px;width:80px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">驳回人:</span>\n <span style=\"display: block;float: left; width:calc(100% - 240px);font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 55px;\">{name}</span>\n </div>\n <div style=\"overflow: hidden;\">\n <span style=\"display: block;float: left; font-size:18px;width:80px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">驳回原因:</span>\n <span style=\"display: block;float: left;width:calc(100% - 240px); font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 55px;\">{remark}</span>\n </div>\n </div>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;margin-top: 26px;\">遇到问题?</div>\n <div style=\"overflow: hidden;line-height: 60px;padding-bottom: 40px;\">\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">请联系驳回人:</span>\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 25px;\"><span>{linkName}</span><span style=\"margin-left: 16px; font-family:MicrosoftYaHei;font-weight:400;color:rgba(64,103,139,1);\">{linkPhone}</span></span>\n </div>\n </div>\n </content>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 6, 'http://202.165.179.86:8081/images/WechatIMG5130.png');

INSERT INTO `wx_msg_validationcode_model` (`id`,`type`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`)
VALUES
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),10, '1001', '审批通过通知', '富茂', '<html><head><meta charset=\"utf-8\"><meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\"><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" /><meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" /><meta name=\"renderer\" content=\"webkit\"><meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\"><title>富茂审批邮件</title><title></title><script> document.documentElement.style.fontSize = document.documentElement.clientWidth / 7.5 + \'px\';</script></head><body><div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\"><header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\"><img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/></header><div style=\"background:#fff;padding:0 0 40px 0;box-sizing: border-box;\"><div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;\">审批通过通知</div><div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding-left: 55px;padding: 36px 55px;\">编号<span>{contract}</span>的{bustype}已经审批通过,请登录<a href=\"{page}\">{page}</a>跟进后续工作</div></div></div></body></html>', '2018-09-29 16:03:11', 1, 1, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1001/logo-new.png'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),11, '1001', '待缴账单通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <style>\n *{\n margin: 0;\n padding: 0;\n }\n </style>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/>\n </header>\n <content>\n <div style=\"background: #fff;padding-bottom: 40px;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding-top: 56px;padding-left: 55px;\">待缴账单通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding:36px 55px 0;\">您当前的待缴账单为<span style=\"font-weight:400;color:rgba(200,89,98,1);margin:0 10px;\">{price}</span>元,截止日期为<span>{date}</span>请登录<span>您的商户端</span>小程序查看账单并缴费</div>\n </div>\n <div style=\"height: auto;width: 100%;line-height: 40px; background: rgba(245,245,245,1);padding: 30px 0;\">\n <div style=\"overflow: hidden;\">\n <span style=\"display: block; font-size:18px;width:80px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">租金账单</span>\n <div style=\"margin: 0 5%;width:90%;overflow: hidden;\">\n <div style=\"width: 33.3%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">账单类型</div>\n <div style=\"width: 33.3%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">账单金额(元)</div>\n <div style=\"width: 33.3%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">缴费时间</div>\n </div>\n {billList}\n </div>\n </div>\n <div style=\"background: #fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold; font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;margin-top: 26px;margin-left: 55px;padding-top: 56px;\">遇到问题?</div>\n <div style=\"overflow: hidden;line-height: 60px;padding-bottom: 40px;\">\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">请联系商管负责人:</span>\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 25px;\"><span>{linkName}</span><span style=\"margin-left: 16px; font-family:MicrosoftYaHei;font-weight:400;color:rgba(64,103,139,1);\">{linkPhone}</span></span>\n </div>\n </div>\n </content>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 2, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1001/logo-new.png'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),12, '1001', '审批通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <script> document.documentElement.style.fontSize = document.documentElement.clientWidth / 7.5 + \'px\';</script>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;padding:0 40px;\" src=\"{bg}\"/>\n </header>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding:56px 55px 0;\">审批通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding: 36px 55px;\"><span>{userName}</span>同意编号<span>{contract}</span>的{bustype}审批,已呈送<span>{toUserName},</span>请登录<a href=\"{page}\">{page}</a>查看审批进度</div>\n </div>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 3, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1001/logo-new.png'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),13, '1001', '欠缴账单通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <style>\n *{\n margin: 0;\n padding: 0;\n }\n </style>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/>\n </header>\n <content>\n <div style=\"background: #fff;padding-bottom: 40px;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;\">欠缴账单通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding: 36px 55px 0;\">您当前的欠缴账单为<span style=\"font-weight:400;color:rgba(200,89,98,1);margin:0 10px;\">{price}</span>元,截止日期为<span>{date}</span>请登录<span>您的商户端</span>小程序查看账单并缴费</div>\n </div>\n <div style=\"height: auto;width: 100%;line-height: 40px; background: rgba(245,245,245,1);padding: 30px 0;\">\n <div style=\"overflow: hidden;\">\n <span style=\"display: block; font-size:18px;width:80px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">租金账单</span>\n <div style=\"margin: 0 5%;width:90%;overflow: hidden;font-size:14px;\">\n <div style=\"width: 25%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">账单类型</div>\n <div style=\"width: 25%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">账单金额(元)</div>\n <div style=\"width: 25%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">缴费时间</div>\n <div style=\"width: 25%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">逾期天数</div>\n </div>\n {billList}\n </div>\n </div>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold; font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;margin-top: 26px;margin-left: 55px;padding-top: 56px;\">遇到问题?</div>\n <div style=\"overflow: hidden;line-height: 60px;padding-bottom: 40px;\">\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">请联系商管负责人:</span>\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 25px;\"><span>{linkName}</span><span style=\"margin-left: 16px; font-family:MicrosoftYaHei;font-weight:400;color:rgba(64,103,139,1);\">{linkPhone}</span></span>\n </div>\n </div>\n </content>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 4, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1001/logo-new.png'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),14, '1001', '待办通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <style>\n *{\n margin: 0;\n padding: 0;\n }\n </style>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/>\n </header>\n <content>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;\">待办通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding: 36px 55px 40px;\"><span>{name}</span><span>提交了一个{bustype}待您审批,电脑登录</span><a href=\"{page}\" target=\"_blank\">{page}</a>查看您的待办</div>\n </div>\n <div style=\"height: auto;width: 100%;line-height: 40px; background: rgba(245,245,245,1);padding: 30px 0;\">\n <div style=\"overflow: hidden;\">\n <div style=\"float: left;font-size:18px;width:cale(20%-55px);font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">申请时间:</div>\n <div style=\"float: left;font-size:18px;width:cale(80%-55px);font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 55px;\">{applyTime}</div>\n </div>\n <div style=\"overflow: hidden;\">\n <div style=\"float: left;font-size:18px;width:cale(20%-55px);font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">申请进度:</div>\n <div style=\"float: left;width:cale(80%-55px);margin-left: 55px;\">\n \n {taskList}\n </div>\n </div>\n </div>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;margin-top: 26px;padding: 56px 55px 0;\">遇到问题?</div>\n <div style=\"overflow: hidden;line-height: 60px;padding-bottom: 40px;\">\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">请联系申请人:</span>\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 25px;\"><span>{linkName}</span><span style=\"margin-left: 16px; font-family:MicrosoftYaHei;font-weight:400;color:rgba(64,103,139,1);\">{linkPhone}</span></span>\n </div>\n </div>\n </content>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 5, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1001/logo-new.png'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),15, '1001', '驳回通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <style>\n *{\n margin: 0;\n padding: 0;\n }\n </style>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/>\n </header>\n <content>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;\">审批通过通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding:36px 55px 40px;\">编号<span>{contract}</span>的{bustype}审批被驳回,请登录<a href=\"{page}\">{page}</a>查看审批明细</div>\n </div>\n <div style=\"height: auto;width: 100%;line-height: 40px; background: rgba(245,245,245,1);padding: 30px 0;\">\n <div style=\"overflow: hidden;\">\n <span style=\"display: block;float: left; font-size:18px;width:80px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">驳回人:</span>\n <span style=\"display: block;float: left; width:calc(100% - 240px);font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 55px;\">{name}</span>\n </div>\n <div style=\"overflow: hidden;\">\n <span style=\"display: block;float: left; font-size:18px;width:80px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">驳回原因:</span>\n <span style=\"display: block;float: left;width:calc(100% - 240px); font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 55px;\">{remark}</span>\n </div>\n </div>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;margin-top: 26px;\">遇到问题?</div>\n <div style=\"overflow: hidden;line-height: 60px;padding-bottom: 40px;\">\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">请联系驳回人:</span>\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 25px;\"><span>{linkName}</span><span style=\"margin-left: 16px; font-family:MicrosoftYaHei;font-weight:400;color:rgba(64,103,139,1);\">{linkPhone}</span></span>\n </div>\n </div>\n </content>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 6, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1001/logo-new.png');

INSERT INTO `wx_msg_validationcode_model` (`id`,`type`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`)
VALUES
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),10, '1002', '审批通过通知', '富茂', '<html><head><meta charset=\"utf-8\"><meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\"><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" /><meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" /><meta name=\"renderer\" content=\"webkit\"><meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\"><title>富茂审批邮件</title><title></title><script> document.documentElement.style.fontSize = document.documentElement.clientWidth / 7.5 + \'px\';</script></head><body><div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\"><header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\"><img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/></header><div style=\"background:#fff;padding:0 0 40px 0;box-sizing: border-box;\"><div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;\">审批通过通知</div><div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding-left: 55px;padding: 36px 55px;\">编号<span>{contract}</span>的{bustype}已经审批通过,请登录<a href=\"{page}\">{page}</a>跟进后续工作</div></div></div></body></html>', '2018-09-29 16:03:11', 1, 1, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1002/tongfulou-h.png'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),11, '1002', '待缴账单通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <style>\n *{\n margin: 0;\n padding: 0;\n }\n </style>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/>\n </header>\n <content>\n <div style=\"background: #fff;padding-bottom: 40px;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding-top: 56px;padding-left: 55px;\">待缴账单通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding:36px 55px 0;\">您当前的待缴账单为<span style=\"font-weight:400;color:rgba(200,89,98,1);margin:0 10px;\">{price}</span>元,截止日期为<span>{date}</span>请登录<span>您的商户端</span>小程序查看账单并缴费</div>\n </div>\n <div style=\"height: auto;width: 100%;line-height: 40px; background: rgba(245,245,245,1);padding: 30px 0;\">\n <div style=\"overflow: hidden;\">\n <span style=\"display: block; font-size:18px;width:80px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">租金账单</span>\n <div style=\"margin: 0 5%;width:90%;overflow: hidden;\">\n <div style=\"width: 33.3%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">账单类型</div>\n <div style=\"width: 33.3%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">账单金额(元)</div>\n <div style=\"width: 33.3%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">缴费时间</div>\n </div>\n {billList}\n </div>\n </div>\n <div style=\"background: #fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold; font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;margin-top: 26px;margin-left: 55px;padding-top: 56px;\">遇到问题?</div>\n <div style=\"overflow: hidden;line-height: 60px;padding-bottom: 40px;\">\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">请联系商管负责人:</span>\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 25px;\"><span>{linkName}</span><span style=\"margin-left: 16px; font-family:MicrosoftYaHei;font-weight:400;color:rgba(64,103,139,1);\">{linkPhone}</span></span>\n </div>\n </div>\n </content>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 2, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1002/tongfulou-h.png'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),12, '1002', '审批通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <script> document.documentElement.style.fontSize = document.documentElement.clientWidth / 7.5 + \'px\';</script>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;padding:0 40px;\" src=\"{bg}\"/>\n </header>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding:56px 55px 0;\">审批通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding: 36px 55px;\"><span>{userName}</span>同意编号<span>{contract}</span>的{bustype}审批,已呈送<span>{toUserName},</span>请登录<a href=\"{page}\">{page}</a>查看审批进度</div>\n </div>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 3, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1002/tongfulou-h.png'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),13, '1002', '欠缴账单通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <style>\n *{\n margin: 0;\n padding: 0;\n }\n </style>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/>\n </header>\n <content>\n <div style=\"background: #fff;padding-bottom: 40px;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;\">欠缴账单通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding: 36px 55px 0;\">您当前的欠缴账单为<span style=\"font-weight:400;color:rgba(200,89,98,1);margin:0 10px;\">{price}</span>元,截止日期为<span>{date}</span>请登录<span>您的商户端</span>小程序查看账单并缴费</div>\n </div>\n <div style=\"height: auto;width: 100%;line-height: 40px; background: rgba(245,245,245,1);padding: 30px 0;\">\n <div style=\"overflow: hidden;\">\n <span style=\"display: block; font-size:18px;width:80px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">租金账单</span>\n <div style=\"margin: 0 5%;width:90%;overflow: hidden;font-size:14px;\">\n <div style=\"width: 25%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">账单类型</div>\n <div style=\"width: 25%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">账单金额(元)</div>\n <div style=\"width: 25%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">缴费时间</div>\n <div style=\"width: 25%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">逾期天数</div>\n </div>\n {billList}\n </div>\n </div>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold; font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;margin-top: 26px;margin-left: 55px;padding-top: 56px;\">遇到问题?</div>\n <div style=\"overflow: hidden;line-height: 60px;padding-bottom: 40px;\">\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">请联系商管负责人:</span>\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 25px;\"><span>{linkName}</span><span style=\"margin-left: 16px; font-family:MicrosoftYaHei;font-weight:400;color:rgba(64,103,139,1);\">{linkPhone}</span></span>\n </div>\n </div>\n </content>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 4, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1002/tongfulou-h.png'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),14, '1002', '待办通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <style>\n *{\n margin: 0;\n padding: 0;\n }\n </style>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/>\n </header>\n <content>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;\">待办通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding: 36px 55px 40px;\"><span>{name}</span><span>提交了一个{bustype}待您审批,电脑登录</span><a href=\"{page}\" target=\"_blank\">{page}</a>查看您的待办</div>\n </div>\n <div style=\"height: auto;width: 100%;line-height: 40px; background: rgba(245,245,245,1);padding: 30px 0;\">\n <div style=\"overflow: hidden;\">\n <div style=\"float: left;font-size:18px;width:cale(20%-55px);font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">申请时间:</div>\n <div style=\"float: left;font-size:18px;width:cale(80%-55px);font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 55px;\">{applyTime}</div>\n </div>\n <div style=\"overflow: hidden;\">\n <div style=\"float: left;font-size:18px;width:cale(20%-55px);font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">申请进度:</div>\n <div style=\"float: left;width:cale(80%-55px);margin-left: 55px;\">\n \n {taskList}\n </div>\n </div>\n </div>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;margin-top: 26px;padding: 56px 55px 0;\">遇到问题?</div>\n <div style=\"overflow: hidden;line-height: 60px;padding-bottom: 40px;\">\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">请联系申请人:</span>\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 25px;\"><span>{linkName}</span><span style=\"margin-left: 16px; font-family:MicrosoftYaHei;font-weight:400;color:rgba(64,103,139,1);\">{linkPhone}</span></span>\n </div>\n </div>\n </content>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 5, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1002/tongfulou-h.png'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),15, '1002', '驳回通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <style>\n *{\n margin: 0;\n padding: 0;\n }\n </style>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/>\n </header>\n <content>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;\">审批通过通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding:36px 55px 40px;\">编号<span>{contract}</span>的{bustype}审批被驳回,请登录<a href=\"{page}\">{page}</a>查看审批明细</div>\n </div>\n <div style=\"height: auto;width: 100%;line-height: 40px; background: rgba(245,245,245,1);padding: 30px 0;\">\n <div style=\"overflow: hidden;\">\n <span style=\"display: block;float: left; font-size:18px;width:80px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">驳回人:</span>\n <span style=\"display: block;float: left; width:calc(100% - 240px);font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 55px;\">{name}</span>\n </div>\n <div style=\"overflow: hidden;\">\n <span style=\"display: block;float: left; font-size:18px;width:80px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">驳回原因:</span>\n <span style=\"display: block;float: left;width:calc(100% - 240px); font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 55px;\">{remark}</span>\n </div>\n </div>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;margin-top: 26px;\">遇到问题?</div>\n <div style=\"overflow: hidden;line-height: 60px;padding-bottom: 40px;\">\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">请联系驳回人:</span>\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 25px;\"><span>{linkName}</span><span style=\"margin-left: 16px; font-family:MicrosoftYaHei;font-weight:400;color:rgba(64,103,139,1);\">{linkPhone}</span></span>\n </div>\n </div>\n </content>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 6, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1002/tongfulou-h.png');

INSERT INTO `wx_msg_validationcode_model` (`id`,`type`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`)
VALUES
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),10, '1003', '审批通过通知', '富茂', '<html><head><meta charset=\"utf-8\"><meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\"><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" /><meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" /><meta name=\"renderer\" content=\"webkit\"><meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\"><title>富茂审批邮件</title><title></title><script> document.documentElement.style.fontSize = document.documentElement.clientWidth / 7.5 + \'px\';</script></head><body><div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\"><header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\"><img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/></header><div style=\"background:#fff;padding:0 0 40px 0;box-sizing: border-box;\"><div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;\">审批通过通知</div><div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding-left: 55px;padding: 36px 55px;\">编号<span>{contract}</span>的{bustype}已经审批通过,请登录<a href=\"{page}\">{page}</a>跟进后续工作</div></div></div></body></html>', '2018-09-29 16:03:11', 1, 1, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1003/dongzhanxiziguoji-h.png'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),11, '1003', '待缴账单通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <style>\n *{\n margin: 0;\n padding: 0;\n }\n </style>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/>\n </header>\n <content>\n <div style=\"background: #fff;padding-bottom: 40px;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding-top: 56px;padding-left: 55px;\">待缴账单通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding:36px 55px 0;\">您当前的待缴账单为<span style=\"font-weight:400;color:rgba(200,89,98,1);margin:0 10px;\">{price}</span>元,截止日期为<span>{date}</span>请登录<span>您的商户端</span>小程序查看账单并缴费</div>\n </div>\n <div style=\"height: auto;width: 100%;line-height: 40px; background: rgba(245,245,245,1);padding: 30px 0;\">\n <div style=\"overflow: hidden;\">\n <span style=\"display: block; font-size:18px;width:80px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">租金账单</span>\n <div style=\"margin: 0 5%;width:90%;overflow: hidden;\">\n <div style=\"width: 33.3%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">账单类型</div>\n <div style=\"width: 33.3%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">账单金额(元)</div>\n <div style=\"width: 33.3%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">缴费时间</div>\n </div>\n {billList}\n </div>\n </div>\n <div style=\"background: #fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold; font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;margin-top: 26px;margin-left: 55px;padding-top: 56px;\">遇到问题?</div>\n <div style=\"overflow: hidden;line-height: 60px;padding-bottom: 40px;\">\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">请联系商管负责人:</span>\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 25px;\"><span>{linkName}</span><span style=\"margin-left: 16px; font-family:MicrosoftYaHei;font-weight:400;color:rgba(64,103,139,1);\">{linkPhone}</span></span>\n </div>\n </div>\n </content>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 2, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1003/dongzhanxiziguoji-h.png'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),12, '1003', '审批通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <script> document.documentElement.style.fontSize = document.documentElement.clientWidth / 7.5 + \'px\';</script>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;padding:0 40px;\" src=\"{bg}\"/>\n </header>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding:56px 55px 0;\">审批通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding: 36px 55px;\"><span>{userName}</span>同意编号<span>{contract}</span>的{bustype}审批,已呈送<span>{toUserName},</span>请登录<a href=\"{page}\">{page}</a>查看审批进度</div>\n </div>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 3, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1003/dongzhanxiziguoji-h.png'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),13, '1003', '欠缴账单通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <style>\n *{\n margin: 0;\n padding: 0;\n }\n </style>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/>\n </header>\n <content>\n <div style=\"background: #fff;padding-bottom: 40px;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;\">欠缴账单通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding: 36px 55px 0;\">您当前的欠缴账单为<span style=\"font-weight:400;color:rgba(200,89,98,1);margin:0 10px;\">{price}</span>元,截止日期为<span>{date}</span>请登录<span>您的商户端</span>小程序查看账单并缴费</div>\n </div>\n <div style=\"height: auto;width: 100%;line-height: 40px; background: rgba(245,245,245,1);padding: 30px 0;\">\n <div style=\"overflow: hidden;\">\n <span style=\"display: block; font-size:18px;width:80px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">租金账单</span>\n <div style=\"margin: 0 5%;width:90%;overflow: hidden;font-size:14px;\">\n <div style=\"width: 25%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">账单类型</div>\n <div style=\"width: 25%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">账单金额(元)</div>\n <div style=\"width: 25%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">缴费时间</div>\n <div style=\"width: 25%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">逾期天数</div>\n </div>\n {billList}\n </div>\n </div>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold; font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;margin-top: 26px;margin-left: 55px;padding-top: 56px;\">遇到问题?</div>\n <div style=\"overflow: hidden;line-height: 60px;padding-bottom: 40px;\">\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">请联系商管负责人:</span>\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 25px;\"><span>{linkName}</span><span style=\"margin-left: 16px; font-family:MicrosoftYaHei;font-weight:400;color:rgba(64,103,139,1);\">{linkPhone}</span></span>\n </div>\n </div>\n </content>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 4, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1003/dongzhanxiziguoji-h.png'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),14, '1003', '待办通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <style>\n *{\n margin: 0;\n padding: 0;\n }\n </style>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/>\n </header>\n <content>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;\">待办通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding: 36px 55px 40px;\"><span>{name}</span><span>提交了一个{bustype}待您审批,电脑登录</span><a href=\"{page}\" target=\"_blank\">{page}</a>查看您的待办</div>\n </div>\n <div style=\"height: auto;width: 100%;line-height: 40px; background: rgba(245,245,245,1);padding: 30px 0;\">\n <div style=\"overflow: hidden;\">\n <div style=\"float: left;font-size:18px;width:cale(20%-55px);font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">申请时间:</div>\n <div style=\"float: left;font-size:18px;width:cale(80%-55px);font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 55px;\">{applyTime}</div>\n </div>\n <div style=\"overflow: hidden;\">\n <div style=\"float: left;font-size:18px;width:cale(20%-55px);font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">申请进度:</div>\n <div style=\"float: left;width:cale(80%-55px);margin-left: 55px;\">\n \n {taskList}\n </div>\n </div>\n </div>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;margin-top: 26px;padding: 56px 55px 0;\">遇到问题?</div>\n <div style=\"overflow: hidden;line-height: 60px;padding-bottom: 40px;\">\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">请联系申请人:</span>\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 25px;\"><span>{linkName}</span><span style=\"margin-left: 16px; font-family:MicrosoftYaHei;font-weight:400;color:rgba(64,103,139,1);\">{linkPhone}</span></span>\n </div>\n </div>\n </content>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 5, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1003/dongzhanxiziguoji-h.png'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),15, '1003', '驳回通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <style>\n *{\n margin: 0;\n padding: 0;\n }\n </style>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/>\n </header>\n <content>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;\">审批通过通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding:36px 55px 40px;\">编号<span>{contract}</span>的{bustype}审批被驳回,请登录<a href=\"{page}\">{page}</a>查看审批明细</div>\n </div>\n <div style=\"height: auto;width: 100%;line-height: 40px; background: rgba(245,245,245,1);padding: 30px 0;\">\n <div style=\"overflow: hidden;\">\n <span style=\"display: block;float: left; font-size:18px;width:80px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">驳回人:</span>\n <span style=\"display: block;float: left; width:calc(100% - 240px);font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 55px;\">{name}</span>\n </div>\n <div style=\"overflow: hidden;\">\n <span style=\"display: block;float: left; font-size:18px;width:80px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">驳回原因:</span>\n <span style=\"display: block;float: left;width:calc(100% - 240px); font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 55px;\">{remark}</span>\n </div>\n </div>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;margin-top: 26px;\">遇到问题?</div>\n <div style=\"overflow: hidden;line-height: 60px;padding-bottom: 40px;\">\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">请联系驳回人:</span>\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 25px;\"><span>{linkName}</span><span style=\"margin-left: 16px; font-family:MicrosoftYaHei;font-weight:400;color:rgba(64,103,139,1);\">{linkPhone}</span></span>\n </div>\n </div>\n </content>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 6, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1003/dongzhanxiziguoji-h.png');

INSERT INTO `wx_msg_validationcode_model` (`id`,`type`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`)
VALUES
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),10, '1004', '审批通过通知', '富茂', '<html><head><meta charset=\"utf-8\"><meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\"><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" /><meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" /><meta name=\"renderer\" content=\"webkit\"><meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\"><title>富茂审批邮件</title><title></title><script> document.documentElement.style.fontSize = document.documentElement.clientWidth / 7.5 + \'px\';</script></head><body><div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\"><header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\"><img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/></header><div style=\"background:#fff;padding:0 0 40px 0;box-sizing: border-box;\"><div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;\">审批通过通知</div><div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding-left: 55px;padding: 36px 55px;\">编号<span>{contract}</span>的{bustype}已经审批通过,请登录<a href=\"{page}\">{page}</a>跟进后续工作</div></div></div></body></html>', '2018-09-29 16:03:11', 1, 1, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1004/ld1086-h.png'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),11, '1004', '待缴账单通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <style>\n *{\n margin: 0;\n padding: 0;\n }\n </style>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/>\n </header>\n <content>\n <div style=\"background: #fff;padding-bottom: 40px;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding-top: 56px;padding-left: 55px;\">待缴账单通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding:36px 55px 0;\">您当前的待缴账单为<span style=\"font-weight:400;color:rgba(200,89,98,1);margin:0 10px;\">{price}</span>元,截止日期为<span>{date}</span>请登录<span>您的商户端</span>小程序查看账单并缴费</div>\n </div>\n <div style=\"height: auto;width: 100%;line-height: 40px; background: rgba(245,245,245,1);padding: 30px 0;\">\n <div style=\"overflow: hidden;\">\n <span style=\"display: block; font-size:18px;width:80px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">租金账单</span>\n <div style=\"margin: 0 5%;width:90%;overflow: hidden;\">\n <div style=\"width: 33.3%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">账单类型</div>\n <div style=\"width: 33.3%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">账单金额(元)</div>\n <div style=\"width: 33.3%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">缴费时间</div>\n </div>\n {billList}\n </div>\n </div>\n <div style=\"background: #fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold; font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;margin-top: 26px;margin-left: 55px;padding-top: 56px;\">遇到问题?</div>\n <div style=\"overflow: hidden;line-height: 60px;padding-bottom: 40px;\">\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">请联系商管负责人:</span>\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 25px;\"><span>{linkName}</span><span style=\"margin-left: 16px; font-family:MicrosoftYaHei;font-weight:400;color:rgba(64,103,139,1);\">{linkPhone}</span></span>\n </div>\n </div>\n </content>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 2, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1004/ld1086-h.png'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),12, '1004', '审批通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <script> document.documentElement.style.fontSize = document.documentElement.clientWidth / 7.5 + \'px\';</script>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;padding:0 40px;\" src=\"{bg}\"/>\n </header>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding:56px 55px 0;\">审批通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding: 36px 55px;\"><span>{userName}</span>同意编号<span>{contract}</span>的{bustype}审批,已呈送<span>{toUserName},</span>请登录<a href=\"{page}\">{page}</a>查看审批进度</div>\n </div>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 3, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1004/ld1086-h.png'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),13, '1004', '欠缴账单通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <style>\n *{\n margin: 0;\n padding: 0;\n }\n </style>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/>\n </header>\n <content>\n <div style=\"background: #fff;padding-bottom: 40px;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;\">欠缴账单通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding: 36px 55px 0;\">您当前的欠缴账单为<span style=\"font-weight:400;color:rgba(200,89,98,1);margin:0 10px;\">{price}</span>元,截止日期为<span>{date}</span>请登录<span>您的商户端</span>小程序查看账单并缴费</div>\n </div>\n <div style=\"height: auto;width: 100%;line-height: 40px; background: rgba(245,245,245,1);padding: 30px 0;\">\n <div style=\"overflow: hidden;\">\n <span style=\"display: block; font-size:18px;width:80px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">租金账单</span>\n <div style=\"margin: 0 5%;width:90%;overflow: hidden;font-size:14px;\">\n <div style=\"width: 25%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">账单类型</div>\n <div style=\"width: 25%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">账单金额(元)</div>\n <div style=\"width: 25%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">缴费时间</div>\n <div style=\"width: 25%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">逾期天数</div>\n </div>\n {billList}\n </div>\n </div>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold; font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;margin-top: 26px;margin-left: 55px;padding-top: 56px;\">遇到问题?</div>\n <div style=\"overflow: hidden;line-height: 60px;padding-bottom: 40px;\">\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">请联系商管负责人:</span>\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 25px;\"><span>{linkName}</span><span style=\"margin-left: 16px; font-family:MicrosoftYaHei;font-weight:400;color:rgba(64,103,139,1);\">{linkPhone}</span></span>\n </div>\n </div>\n </content>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 4, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1004/ld1086-h.png'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),14, '1004', '待办通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <style>\n *{\n margin: 0;\n padding: 0;\n }\n </style>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/>\n </header>\n <content>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;\">待办通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding: 36px 55px 40px;\"><span>{name}</span><span>提交了一个{bustype}待您审批,电脑登录</span><a href=\"{page}\" target=\"_blank\">{page}</a>查看您的待办</div>\n </div>\n <div style=\"height: auto;width: 100%;line-height: 40px; background: rgba(245,245,245,1);padding: 30px 0;\">\n <div style=\"overflow: hidden;\">\n <div style=\"float: left;font-size:18px;width:cale(20%-55px);font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">申请时间:</div>\n <div style=\"float: left;font-size:18px;width:cale(80%-55px);font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 55px;\">{applyTime}</div>\n </div>\n <div style=\"overflow: hidden;\">\n <div style=\"float: left;font-size:18px;width:cale(20%-55px);font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">申请进度:</div>\n <div style=\"float: left;width:cale(80%-55px);margin-left: 55px;\">\n \n {taskList}\n </div>\n </div>\n </div>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;margin-top: 26px;padding: 56px 55px 0;\">遇到问题?</div>\n <div style=\"overflow: hidden;line-height: 60px;padding-bottom: 40px;\">\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">请联系申请人:</span>\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 25px;\"><span>{linkName}</span><span style=\"margin-left: 16px; font-family:MicrosoftYaHei;font-weight:400;color:rgba(64,103,139,1);\">{linkPhone}</span></span>\n </div>\n </div>\n </content>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 5, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1004/ld1086-h.png'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),15, '1004', '驳回通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <style>\n *{\n margin: 0;\n padding: 0;\n }\n </style>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/>\n </header>\n <content>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;\">审批通过通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding:36px 55px 40px;\">编号<span>{contract}</span>的{bustype}审批被驳回,请登录<a href=\"{page}\">{page}</a>查看审批明细</div>\n </div>\n <div style=\"height: auto;width: 100%;line-height: 40px; background: rgba(245,245,245,1);padding: 30px 0;\">\n <div style=\"overflow: hidden;\">\n <span style=\"display: block;float: left; font-size:18px;width:80px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">驳回人:</span>\n <span style=\"display: block;float: left; width:calc(100% - 240px);font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 55px;\">{name}</span>\n </div>\n <div style=\"overflow: hidden;\">\n <span style=\"display: block;float: left; font-size:18px;width:80px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">驳回原因:</span>\n <span style=\"display: block;float: left;width:calc(100% - 240px); font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 55px;\">{remark}</span>\n </div>\n </div>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;margin-top: 26px;\">遇到问题?</div>\n <div style=\"overflow: hidden;line-height: 60px;padding-bottom: 40px;\">\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">请联系驳回人:</span>\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 25px;\"><span>{linkName}</span><span style=\"margin-left: 16px; font-family:MicrosoftYaHei;font-weight:400;color:rgba(64,103,139,1);\">{linkPhone}</span></span>\n </div>\n </div>\n </content>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 6, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1004/ld1086-h.png');

INSERT INTO `wx_msg_validationcode_model` (`id`,`type`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`)
VALUES
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),10, '1005', '审批通过通知', '富茂', '<html><head><meta charset=\"utf-8\"><meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\"><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" /><meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" /><meta name=\"renderer\" content=\"webkit\"><meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\"><title>富茂审批邮件</title><title></title><script> document.documentElement.style.fontSize = document.documentElement.clientWidth / 7.5 + \'px\';</script></head><body><div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\"><header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\"><img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/></header><div style=\"background:#fff;padding:0 0 40px 0;box-sizing: border-box;\"><div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;\">审批通过通知</div><div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding-left: 55px;padding: 36px 55px;\">编号<span>{contract}</span>的{bustype}已经审批通过,请登录<a href=\"{page}\">{page}</a>跟进后续工作</div></div></div></body></html>', '2018-09-29 16:03:11', 1, 1, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1005/yxtlw-h.png'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),11, '1005', '待缴账单通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <style>\n *{\n margin: 0;\n padding: 0;\n }\n </style>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/>\n </header>\n <content>\n <div style=\"background: #fff;padding-bottom: 40px;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding-top: 56px;padding-left: 55px;\">待缴账单通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding:36px 55px 0;\">您当前的待缴账单为<span style=\"font-weight:400;color:rgba(200,89,98,1);margin:0 10px;\">{price}</span>元,截止日期为<span>{date}</span>请登录<span>您的商户端</span>小程序查看账单并缴费</div>\n </div>\n <div style=\"height: auto;width: 100%;line-height: 40px; background: rgba(245,245,245,1);padding: 30px 0;\">\n <div style=\"overflow: hidden;\">\n <span style=\"display: block; font-size:18px;width:80px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">租金账单</span>\n <div style=\"margin: 0 5%;width:90%;overflow: hidden;\">\n <div style=\"width: 33.3%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">账单类型</div>\n <div style=\"width: 33.3%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">账单金额(元)</div>\n <div style=\"width: 33.3%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">缴费时间</div>\n </div>\n {billList}\n </div>\n </div>\n <div style=\"background: #fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold; font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;margin-top: 26px;margin-left: 55px;padding-top: 56px;\">遇到问题?</div>\n <div style=\"overflow: hidden;line-height: 60px;padding-bottom: 40px;\">\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">请联系商管负责人:</span>\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 25px;\"><span>{linkName}</span><span style=\"margin-left: 16px; font-family:MicrosoftYaHei;font-weight:400;color:rgba(64,103,139,1);\">{linkPhone}</span></span>\n </div>\n </div>\n </content>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 2, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1005/yxtlw-h.png'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),12, '1005', '审批通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <script> document.documentElement.style.fontSize = document.documentElement.clientWidth / 7.5 + \'px\';</script>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;padding:0 40px;\" src=\"{bg}\"/>\n </header>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding:56px 55px 0;\">审批通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding: 36px 55px;\"><span>{userName}</span>同意编号<span>{contract}</span>的{bustype}审批,已呈送<span>{toUserName},</span>请登录<a href=\"{page}\">{page}</a>查看审批进度</div>\n </div>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 3, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1005/yxtlw-h.png'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),13, '1005', '欠缴账单通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <style>\n *{\n margin: 0;\n padding: 0;\n }\n </style>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/>\n </header>\n <content>\n <div style=\"background: #fff;padding-bottom: 40px;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;\">欠缴账单通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding: 36px 55px 0;\">您当前的欠缴账单为<span style=\"font-weight:400;color:rgba(200,89,98,1);margin:0 10px;\">{price}</span>元,截止日期为<span>{date}</span>请登录<span>您的商户端</span>小程序查看账单并缴费</div>\n </div>\n <div style=\"height: auto;width: 100%;line-height: 40px; background: rgba(245,245,245,1);padding: 30px 0;\">\n <div style=\"overflow: hidden;\">\n <span style=\"display: block; font-size:18px;width:80px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">租金账单</span>\n <div style=\"margin: 0 5%;width:90%;overflow: hidden;font-size:14px;\">\n <div style=\"width: 25%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">账单类型</div>\n <div style=\"width: 25%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">账单金额(元)</div>\n <div style=\"width: 25%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">缴费时间</div>\n <div style=\"width: 25%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">逾期天数</div>\n </div>\n {billList}\n </div>\n </div>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold; font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;margin-top: 26px;margin-left: 55px;padding-top: 56px;\">遇到问题?</div>\n <div style=\"overflow: hidden;line-height: 60px;padding-bottom: 40px;\">\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">请联系商管负责人:</span>\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 25px;\"><span>{linkName}</span><span style=\"margin-left: 16px; font-family:MicrosoftYaHei;font-weight:400;color:rgba(64,103,139,1);\">{linkPhone}</span></span>\n </div>\n </div>\n </content>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 4, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1005/yxtlw-h.png'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),14, '1005', '待办通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <style>\n *{\n margin: 0;\n padding: 0;\n }\n </style>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/>\n </header>\n <content>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;\">待办通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding: 36px 55px 40px;\"><span>{name}</span><span>提交了一个{bustype}待您审批,电脑登录</span><a href=\"{page}\" target=\"_blank\">{page}</a>查看您的待办</div>\n </div>\n <div style=\"height: auto;width: 100%;line-height: 40px; background: rgba(245,245,245,1);padding: 30px 0;\">\n <div style=\"overflow: hidden;\">\n <div style=\"float: left;font-size:18px;width:cale(20%-55px);font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">申请时间:</div>\n <div style=\"float: left;font-size:18px;width:cale(80%-55px);font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 55px;\">{applyTime}</div>\n </div>\n <div style=\"overflow: hidden;\">\n <div style=\"float: left;font-size:18px;width:cale(20%-55px);font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">申请进度:</div>\n <div style=\"float: left;width:cale(80%-55px);margin-left: 55px;\">\n \n {taskList}\n </div>\n </div>\n </div>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;margin-top: 26px;padding: 56px 55px 0;\">遇到问题?</div>\n <div style=\"overflow: hidden;line-height: 60px;padding-bottom: 40px;\">\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">请联系申请人:</span>\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 25px;\"><span>{linkName}</span><span style=\"margin-left: 16px; font-family:MicrosoftYaHei;font-weight:400;color:rgba(64,103,139,1);\">{linkPhone}</span></span>\n </div>\n </div>\n </content>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 5, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1005/yxtlw-h.png'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),15, '1005', '驳回通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <style>\n *{\n margin: 0;\n padding: 0;\n }\n </style>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/>\n </header>\n <content>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;\">审批通过通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding:36px 55px 40px;\">编号<span>{contract}</span>的{bustype}审批被驳回,请登录<a href=\"{page}\">{page}</a>查看审批明细</div>\n </div>\n <div style=\"height: auto;width: 100%;line-height: 40px; background: rgba(245,245,245,1);padding: 30px 0;\">\n <div style=\"overflow: hidden;\">\n <span style=\"display: block;float: left; font-size:18px;width:80px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">驳回人:</span>\n <span style=\"display: block;float: left; width:calc(100% - 240px);font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 55px;\">{name}</span>\n </div>\n <div style=\"overflow: hidden;\">\n <span style=\"display: block;float: left; font-size:18px;width:80px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">驳回原因:</span>\n <span style=\"display: block;float: left;width:calc(100% - 240px); font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 55px;\">{remark}</span>\n </div>\n </div>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;margin-top: 26px;\">遇到问题?</div>\n <div style=\"overflow: hidden;line-height: 60px;padding-bottom: 40px;\">\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">请联系驳回人:</span>\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 25px;\"><span>{linkName}</span><span style=\"margin-left: 16px; font-family:MicrosoftYaHei;font-weight:400;color:rgba(64,103,139,1);\">{linkPhone}</span></span>\n </div>\n </div>\n </content>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 6, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1005/yxtlw-h.png');

INSERT INTO `wx_msg_validationcode_model` (`id`,`type`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`)
VALUES
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),10, '1006', '审批通过通知', '富茂', '<html><head><meta charset=\"utf-8\"><meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\"><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" /><meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" /><meta name=\"renderer\" content=\"webkit\"><meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\"><title>富茂审批邮件</title><title></title><script> document.documentElement.style.fontSize = document.documentElement.clientWidth / 7.5 + \'px\';</script></head><body><div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\"><header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\"><img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/></header><div style=\"background:#fff;padding:0 0 40px 0;box-sizing: border-box;\"><div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;\">审批通过通知</div><div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding-left: 55px;padding: 36px 55px;\">编号<span>{contract}</span>的{bustype}已经审批通过,请登录<a href=\"{page}\">{page}</a>跟进后续工作</div></div></div></body></html>', '2018-09-29 16:03:11', 1, 1, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1006/hyc-h.png'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),11, '1006', '待缴账单通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <style>\n *{\n margin: 0;\n padding: 0;\n }\n </style>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/>\n </header>\n <content>\n <div style=\"background: #fff;padding-bottom: 40px;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding-top: 56px;padding-left: 55px;\">待缴账单通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding:36px 55px 0;\">您当前的待缴账单为<span style=\"font-weight:400;color:rgba(200,89,98,1);margin:0 10px;\">{price}</span>元,截止日期为<span>{date}</span>请登录<span>您的商户端</span>小程序查看账单并缴费</div>\n </div>\n <div style=\"height: auto;width: 100%;line-height: 40px; background: rgba(245,245,245,1);padding: 30px 0;\">\n <div style=\"overflow: hidden;\">\n <span style=\"display: block; font-size:18px;width:80px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">租金账单</span>\n <div style=\"margin: 0 5%;width:90%;overflow: hidden;\">\n <div style=\"width: 33.3%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">账单类型</div>\n <div style=\"width: 33.3%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">账单金额(元)</div>\n <div style=\"width: 33.3%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">缴费时间</div>\n </div>\n {billList}\n </div>\n </div>\n <div style=\"background: #fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold; font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;margin-top: 26px;margin-left: 55px;padding-top: 56px;\">遇到问题?</div>\n <div style=\"overflow: hidden;line-height: 60px;padding-bottom: 40px;\">\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">请联系商管负责人:</span>\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 25px;\"><span>{linkName}</span><span style=\"margin-left: 16px; font-family:MicrosoftYaHei;font-weight:400;color:rgba(64,103,139,1);\">{linkPhone}</span></span>\n </div>\n </div>\n </content>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 2, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1006/hyc-h.png'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),12, '1006', '审批通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <script> document.documentElement.style.fontSize = document.documentElement.clientWidth / 7.5 + \'px\';</script>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;padding:0 40px;\" src=\"{bg}\"/>\n </header>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding:56px 55px 0;\">审批通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding: 36px 55px;\"><span>{userName}</span>同意编号<span>{contract}</span>的{bustype}审批,已呈送<span>{toUserName},</span>请登录<a href=\"{page}\">{page}</a>查看审批进度</div>\n </div>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 3, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1006/hyc-h.png'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),13, '1006', '欠缴账单通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <style>\n *{\n margin: 0;\n padding: 0;\n }\n </style>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/>\n </header>\n <content>\n <div style=\"background: #fff;padding-bottom: 40px;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;\">欠缴账单通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding: 36px 55px 0;\">您当前的欠缴账单为<span style=\"font-weight:400;color:rgba(200,89,98,1);margin:0 10px;\">{price}</span>元,截止日期为<span>{date}</span>请登录<span>您的商户端</span>小程序查看账单并缴费</div>\n </div>\n <div style=\"height: auto;width: 100%;line-height: 40px; background: rgba(245,245,245,1);padding: 30px 0;\">\n <div style=\"overflow: hidden;\">\n <span style=\"display: block; font-size:18px;width:80px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">租金账单</span>\n <div style=\"margin: 0 5%;width:90%;overflow: hidden;font-size:14px;\">\n <div style=\"width: 25%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">账单类型</div>\n <div style=\"width: 25%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">账单金额(元)</div>\n <div style=\"width: 25%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">缴费时间</div>\n <div style=\"width: 25%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">逾期天数</div>\n </div>\n {billList}\n </div>\n </div>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold; font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;margin-top: 26px;margin-left: 55px;padding-top: 56px;\">遇到问题?</div>\n <div style=\"overflow: hidden;line-height: 60px;padding-bottom: 40px;\">\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">请联系商管负责人:</span>\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 25px;\"><span>{linkName}</span><span style=\"margin-left: 16px; font-family:MicrosoftYaHei;font-weight:400;color:rgba(64,103,139,1);\">{linkPhone}</span></span>\n </div>\n </div>\n </content>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 4, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1006/hyc-h.png'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),14, '1006', '待办通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <style>\n *{\n margin: 0;\n padding: 0;\n }\n </style>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/>\n </header>\n <content>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;\">待办通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding: 36px 55px 40px;\"><span>{name}</span><span>提交了一个{bustype}待您审批,电脑登录</span><a href=\"{page}\" target=\"_blank\">{page}</a>查看您的待办</div>\n </div>\n <div style=\"height: auto;width: 100%;line-height: 40px; background: rgba(245,245,245,1);padding: 30px 0;\">\n <div style=\"overflow: hidden;\">\n <div style=\"float: left;font-size:18px;width:cale(20%-55px);font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">申请时间:</div>\n <div style=\"float: left;font-size:18px;width:cale(80%-55px);font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 55px;\">{applyTime}</div>\n </div>\n <div style=\"overflow: hidden;\">\n <div style=\"float: left;font-size:18px;width:cale(20%-55px);font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">申请进度:</div>\n <div style=\"float: left;width:cale(80%-55px);margin-left: 55px;\">\n \n {taskList}\n </div>\n </div>\n </div>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;margin-top: 26px;padding: 56px 55px 0;\">遇到问题?</div>\n <div style=\"overflow: hidden;line-height: 60px;padding-bottom: 40px;\">\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">请联系申请人:</span>\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 25px;\"><span>{linkName}</span><span style=\"margin-left: 16px; font-family:MicrosoftYaHei;font-weight:400;color:rgba(64,103,139,1);\">{linkPhone}</span></span>\n </div>\n </div>\n </content>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 5, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1006/hyc-h.png'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),15, '1006', '驳回通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <style>\n *{\n margin: 0;\n padding: 0;\n }\n </style>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/>\n </header>\n <content>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;\">审批通过通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding:36px 55px 40px;\">编号<span>{contract}</span>的{bustype}审批被驳回,请登录<a href=\"{page}\">{page}</a>查看审批明细</div>\n </div>\n <div style=\"height: auto;width: 100%;line-height: 40px; background: rgba(245,245,245,1);padding: 30px 0;\">\n <div style=\"overflow: hidden;\">\n <span style=\"display: block;float: left; font-size:18px;width:80px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">驳回人:</span>\n <span style=\"display: block;float: left; width:calc(100% - 240px);font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 55px;\">{name}</span>\n </div>\n <div style=\"overflow: hidden;\">\n <span style=\"display: block;float: left; font-size:18px;width:80px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">驳回原因:</span>\n <span style=\"display: block;float: left;width:calc(100% - 240px); font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 55px;\">{remark}</span>\n </div>\n </div>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;margin-top: 26px;\">遇到问题?</div>\n <div style=\"overflow: hidden;line-height: 60px;padding-bottom: 40px;\">\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">请联系驳回人:</span>\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 25px;\"><span>{linkName}</span><span style=\"margin-left: 16px; font-family:MicrosoftYaHei;font-weight:400;color:rgba(64,103,139,1);\">{linkPhone}</span></span>\n </div>\n </div>\n </content>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 6, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1006/hyc-h.png');


INSERT INTO `wx_msg_validationcode_model` (`id`,`type`, `tenant_id`, `name`, `signature`, `content`, `createtime`, `status`, `model_id`, `email_bg_img`)
VALUES
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),10, '1007', '审批通过通知', '富茂', '<html><head><meta charset=\"utf-8\"><meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\"><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" /><meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" /><meta name=\"renderer\" content=\"webkit\"><meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\"><title>富茂审批邮件</title><title></title><script> document.documentElement.style.fontSize = document.documentElement.clientWidth / 7.5 + \'px\';</script></head><body><div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\"><header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\"><img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/></header><div style=\"background:#fff;padding:0 0 40px 0;box-sizing: border-box;\"><div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;\">审批通过通知</div><div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding-left: 55px;padding: 36px 55px;\">编号<span>{contract}</span>的{bustype}已经审批通过,请登录<a href=\"{page}\">{page}</a>跟进后续工作</div></div></div></body></html>', '2018-09-29 16:03:11', 1, 1, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1007/njol-h.jpeg'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),11, '1007', '待缴账单通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <style>\n *{\n margin: 0;\n padding: 0;\n }\n </style>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/>\n </header>\n <content>\n <div style=\"background: #fff;padding-bottom: 40px;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding-top: 56px;padding-left: 55px;\">待缴账单通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding:36px 55px 0;\">您当前的待缴账单为<span style=\"font-weight:400;color:rgba(200,89,98,1);margin:0 10px;\">{price}</span>元,截止日期为<span>{date}</span>请登录<span>您的商户端</span>小程序查看账单并缴费</div>\n </div>\n <div style=\"height: auto;width: 100%;line-height: 40px; background: rgba(245,245,245,1);padding: 30px 0;\">\n <div style=\"overflow: hidden;\">\n <span style=\"display: block; font-size:18px;width:80px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">租金账单</span>\n <div style=\"margin: 0 5%;width:90%;overflow: hidden;\">\n <div style=\"width: 33.3%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">账单类型</div>\n <div style=\"width: 33.3%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">账单金额(元)</div>\n <div style=\"width: 33.3%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">缴费时间</div>\n </div>\n {billList}\n </div>\n </div>\n <div style=\"background: #fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold; font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;margin-top: 26px;margin-left: 55px;padding-top: 56px;\">遇到问题?</div>\n <div style=\"overflow: hidden;line-height: 60px;padding-bottom: 40px;\">\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">请联系商管负责人:</span>\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 25px;\"><span>{linkName}</span><span style=\"margin-left: 16px; font-family:MicrosoftYaHei;font-weight:400;color:rgba(64,103,139,1);\">{linkPhone}</span></span>\n </div>\n </div>\n </content>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 2, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1007/njol-h.jpeg'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),12, '1007', '审批通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <script> document.documentElement.style.fontSize = document.documentElement.clientWidth / 7.5 + \'px\';</script>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;padding:0 40px;\" src=\"{bg}\"/>\n </header>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding:56px 55px 0;\">审批通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding: 36px 55px;\"><span>{userName}</span>同意编号<span>{contract}</span>的{bustype}审批,已呈送<span>{toUserName},</span>请登录<a href=\"{page}\">{page}</a>查看审批进度</div>\n </div>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 3, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1007/njol-h.jpeg'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),13, '1007', '欠缴账单通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <style>\n *{\n margin: 0;\n padding: 0;\n }\n </style>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/>\n </header>\n <content>\n <div style=\"background: #fff;padding-bottom: 40px;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;\">欠缴账单通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding: 36px 55px 0;\">您当前的欠缴账单为<span style=\"font-weight:400;color:rgba(200,89,98,1);margin:0 10px;\">{price}</span>元,截止日期为<span>{date}</span>请登录<span>您的商户端</span>小程序查看账单并缴费</div>\n </div>\n <div style=\"height: auto;width: 100%;line-height: 40px; background: rgba(245,245,245,1);padding: 30px 0;\">\n <div style=\"overflow: hidden;\">\n <span style=\"display: block; font-size:18px;width:80px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">租金账单</span>\n <div style=\"margin: 0 5%;width:90%;overflow: hidden;font-size:14px;\">\n <div style=\"width: 25%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">账单类型</div>\n <div style=\"width: 25%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">账单金额(元)</div>\n <div style=\"width: 25%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">缴费时间</div>\n <div style=\"width: 25%;float: left;height: 60px;line-height: 60px;text-align: center;font-family:MicrosoftYaHei;color:rgba(85,85,85,1);\">逾期天数</div>\n </div>\n {billList}\n </div>\n </div>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold; font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;margin-top: 26px;margin-left: 55px;padding-top: 56px;\">遇到问题?</div>\n <div style=\"overflow: hidden;line-height: 60px;padding-bottom: 40px;\">\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">请联系商管负责人:</span>\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 25px;\"><span>{linkName}</span><span style=\"margin-left: 16px; font-family:MicrosoftYaHei;font-weight:400;color:rgba(64,103,139,1);\">{linkPhone}</span></span>\n </div>\n </div>\n </content>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 4, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1007/njol-h.jpeg'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),14, '1007', '待办通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <style>\n *{\n margin: 0;\n padding: 0;\n }\n </style>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/>\n </header>\n <content>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;\">待办通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding: 36px 55px 40px;\"><span>{name}</span><span>提交了一个{bustype}待您审批,电脑登录</span><a href=\"{page}\" target=\"_blank\">{page}</a>查看您的待办</div>\n </div>\n <div style=\"height: auto;width: 100%;line-height: 40px; background: rgba(245,245,245,1);padding: 30px 0;\">\n <div style=\"overflow: hidden;\">\n <div style=\"float: left;font-size:18px;width:cale(20%-55px);font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">申请时间:</div>\n <div style=\"float: left;font-size:18px;width:cale(80%-55px);font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 55px;\">{applyTime}</div>\n </div>\n <div style=\"overflow: hidden;\">\n <div style=\"float: left;font-size:18px;width:cale(20%-55px);font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">申请进度:</div>\n <div style=\"float: left;width:cale(80%-55px);margin-left: 55px;\">\n \n {taskList}\n </div>\n </div>\n </div>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;margin-top: 26px;padding: 56px 55px 0;\">遇到问题?</div>\n <div style=\"overflow: hidden;line-height: 60px;padding-bottom: 40px;\">\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">请联系申请人:</span>\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 25px;\"><span>{linkName}</span><span style=\"margin-left: 16px; font-family:MicrosoftYaHei;font-weight:400;color:rgba(64,103,139,1);\">{linkPhone}</span></span>\n </div>\n </div>\n </content>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 5, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1007/njol-h.jpeg'),
((select unix_timestamp(now()) + CEILING(RAND()*90000+10000)),15, '1007', '驳回通知', '富茂', '<!DOCTYPE html>\n<html>\n\n<head>\n <meta charset=\"utf-8\">\n <meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\">\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n <meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n <meta name=\"renderer\" content=\"webkit\">\n <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">\n <title>富茂审批邮件</title>\n <title></title>\n <style>\n *{\n margin: 0;\n padding: 0;\n }\n </style>\n</head>\n\n<body>\n <div id=\"box\" style=\"padding:80px 20%;background:#E9E7E7;min-height:100vh;\">\n <header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\">\n <img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"{bg}\"/>\n </header>\n <content>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;\">审批通过通知</div>\n <div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);padding:36px 55px 40px;\">编号<span>{contract}</span>的{bustype}审批被驳回,请登录<a href=\"{page}\">{page}</a>查看审批明细</div>\n </div>\n <div style=\"height: auto;width: 100%;line-height: 40px; background: rgba(245,245,245,1);padding: 30px 0;\">\n <div style=\"overflow: hidden;\">\n <span style=\"display: block;float: left; font-size:18px;width:80px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">驳回人:</span>\n <span style=\"display: block;float: left; width:calc(100% - 240px);font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 55px;\">{name}</span>\n </div>\n <div style=\"overflow: hidden;\">\n <span style=\"display: block;float: left; font-size:18px;width:80px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">驳回原因:</span>\n <span style=\"display: block;float: left;width:calc(100% - 240px); font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 55px;\">{remark}</span>\n </div>\n </div>\n <div style=\"background:#fff;\">\n <div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;padding: 56px 55px 0;margin-top: 26px;\">遇到问题?</div>\n <div style=\"overflow: hidden;line-height: 60px;padding-bottom: 40px;\">\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(153,153,153,1);margin-left: 55px;\">请联系驳回人:</span>\n <span style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 25px;\"><span>{linkName}</span><span style=\"margin-left: 16px; font-family:MicrosoftYaHei;font-weight:400;color:rgba(64,103,139,1);\">{linkPhone}</span></span>\n </div>\n </div>\n </content>\n </div>\n</body>\n\n</html>', '2018-09-29 16:03:11', 1, 6, 'https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/1007/njol-h.jpeg');







+ 0
- 2
mallinkAdmin/src/main/resources/db/migration/V201905061431__L_VAL_MSG_MODEL_DATA_DEL.sql Просмотреть файл

@@ -1,2 +0,0 @@
delete from wx_msg_model where name in('欠缴账单通知','待缴账单通知','审批通过通知','待办通知','审批通知','驳回通知');
alter table wx_msg_model drop column email_bg_img;

+ 0
- 1
mallinkAdmin/src/main/resources/db/migration/V201905061550__MERCHANT_UPDATE.sql Просмотреть файл

@@ -1 +0,0 @@
alter table wx_merchant add column top_time datetime default now() comment '置顶时间';

+ 0
- 1
mallinkAdmin/src/main/resources/db/migration/V201905061616__MODIFY_SCORE_RULES.sql Просмотреть файл

@@ -1 +0,0 @@
update wx_score_rules set rules = JSON_REMOVE(rules,'$[3]');

+ 0
- 4
mallinkAdmin/src/main/resources/db/migration/V201905071520__CHANGE_MALL.sql Просмотреть файл

@@ -1,4 +0,0 @@
ALTER TABLE wx_mall
ADD COLUMN sale_type tinyint(2) DEFAULT '1' COMMENT '销售类型',
ADD COLUMN valid_start DATE default null COMMENT '启用起始时间',
ADD COLUMN valid_end DATE default null COMMENT '启用结束时间';

+ 0
- 1
mallinkAdmin/src/main/resources/db/migration/V201905081200__UPDATE_SHARIING_RECEIVER.sql Просмотреть файл

@@ -1 +0,0 @@
alter table wx_profit_sharing_receiver add column is_use smallint(2) default 0 comment '是否使用1使用0不使用';

+ 0
- 102
mallinkAdmin/src/main/resources/db/migration/V201905081900__UPDATE_MSG_MODEL.sql Просмотреть файл

@@ -1,102 +0,0 @@
#商户分账账户新增通知商管
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(80,'456','10','商户分账账户新增通知商管','富茂','{merchant}商户提交了收款账户绑定申请,请及时登录管理端处理',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(110,'1001','10','商户分账账户新增通知商管','长融世贸广场','{merchant}商户提交了收款账户绑定申请,请及时登录管理端处理',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(210,'1002','10','商户分账账户新增通知商管','同保楼 同福街','{merchant}商户提交了收款账户绑定申请,请及时登录管理端处理',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(310,'1003','10','商户分账账户新增通知商管','杭州东站西子国际','{merchant}商户提交了收款账户绑定申请,请及时登录管理端处理',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(410,'1004','10','商户分账账户新增通知商管','莱迪1086商业中心','{merchant}商户提交了收款账户绑定申请,请及时登录管理端处理',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(510,'1005','10','商户分账账户新增通知商管','永修铜锣湾广场','{merchant}商户提交了收款账户绑定申请,请及时登录管理端处理',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(610,'1006','10','商户分账账户新增通知商管','欧堡利亚海悦城','{merchant}商户提交了收款账户绑定申请,请及时登录管理端处理',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(710,'1007','10','商户分账账户新增通知商管','澳林广场','{merchant}商户提交了收款账户绑定申请,请及时登录管理端处理',now(),1,0,null);
#商户分账账户新增通知商户
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(81,'456','11','商户分账账户新增通知商户','富茂','您于{time}提交了{merchant}商户的收款账户[{account}]绑定,后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(111,'1001','11','商户分账账户新增通知商户','长融世贸广场','您于{time}提交了{merchant}商户的收款账户[{account}]绑定,后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(211,'1002','11','商户分账账户新增通知商户','同保楼 同福街','您于{time}提交了{merchant}商户的收款账户[{account}]绑定,后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(311,'1003','11','商户分账账户新增通知商户','杭州东站西子国际','您于{time}提交了{merchant}商户的收款账户[{account}]绑定,后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(411,'1004','11','商户分账账户新增通知商户','莱迪1086商业中心','您于{time}提交了{merchant}商户的收款账户[{account}]绑定,后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(511,'1005','11','商户分账账户新增通知商户','永修铜锣湾广场','您于{time}提交了{merchant}商户的收款账户[{account}]绑定,后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(611,'1006','11','商户分账账户新增通知商户','欧堡利亚海悦城','您于{time}提交了{merchant}商户的收款账户[{account}]绑定,后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(711,'1007','11','商户分账账户新增通知商户','澳林广场','您于{time}提交了{merchant}商户的收款账户[{account}]绑定,后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null);
#商户分账账户变更通知商管
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(82,'456','12','商户分账账户变更通知商管','富茂','{merchant}商户提交了收款账户变更申请,请及时登录管理端处理',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(112,'1001','12','商户分账账户变更通知商管','长融世贸广场','{merchant}商户提交了收款账户变更申请,请及时登录管理端处理',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(212,'1002','12','商户分账账户变更通知商管','同保楼 同福街','{merchant}商户提交了收款账户变更申请,请及时登录管理端处理',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(312,'1003','12','商户分账账户变更通知商管','杭州东站西子国际','{merchant}商户提交了收款账户变更申请,请及时登录管理端处理',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(412,'1004','12','商户分账账户变更通知商管','莱迪1086商业中心','{merchant}商户提交了收款账户变更申请,请及时登录管理端处理',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(512,'1005','12','商户分账账户变更通知商管','永修铜锣湾广场','{merchant}商户提交了收款账户变更申请,请及时登录管理端处理',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(612,'1006','12','商户分账账户变更通知商管','欧堡利亚海悦城','{merchant}商户提交了收款账户变更申请,请及时登录管理端处理',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(712,'1007','12','商户分账账户变更通知商管','澳林广场','{merchant}商户提交了收款账户变更申请,请及时登录管理端处理',now(),1,0,null);
#商户分账账户变更通知商户
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(83,'456','13','商户分账账户变更通知商户','富茂','您于{time}将{merchant}商户的收款账户变更为[{account}],后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(113,'1001','13','商户分账账户变更通知商户','长融世贸广场','您于{time}将{merchant}商户的收款账户变更为[{account}],后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(213,'1002','13','商户分账账户变更通知商户','同保楼 同福街','您于{time}将{merchant}商户的收款账户变更为[{account}],后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(313,'1003','13','商户分账账户变更通知商户','杭州东站西子国际','您于{time}将{merchant}商户的收款账户变更为[{account}],后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(413,'1004','13','商户分账账户变更通知商户','莱迪1086商业中心','您于{time}将{merchant}商户的收款账户变更为[{account}],后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(513,'1005','13','商户分账账户变更通知商户','永修铜锣湾广场','您于{time}将{merchant}商户的收款账户变更为[{account}],后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(613,'1006','13','商户分账账户变更通知商户','欧堡利亚海悦城','您于{time}将{merchant}商户的收款账户变更为[{account}],后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(713,'1007','13','商户分账账户变更通知商户','澳林广场','您于{time}将{merchant}商户的收款账户变更为[{account}],后续销售分成及营销补贴将存入该账户,非本人操作请及时联系商管',now(),1,0,null);
#商户分账账户使用回执
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(84,'456','14','商户分账账户不使用回执','富茂','商管已同意{account}作为{merchant}商户的收款账户。后续的销售分成及营销补贴将存入此账户',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(114,'1001','14','商户分账账户不使用回执','长融世贸广场','商管已同意[{account}]作为{merchant}商户的收款账户。后续的销售分成及营销补贴将存入此账户',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(214,'1002','14','商户分账账户不使用回执','同保楼 同福街','商管已同意]{account}]作为{merchant}商户的收款账户。后续的销售分成及营销补贴将存入此账户',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(314,'1003','14','商户分账账户不使用回执','杭州东站西子国际','商管已同意[{account}]作为{merchant}商户的收款账户。后续的销售分成及营销补贴将存入此账户',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(414,'1004','14','商户分账账户不使用回执','莱迪1086商业中心','商管已同意[{account}]作为{merchant}商户的收款账户。后续的销售分成及营销补贴将存入此账户',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(514,'1005','14','商户分账账户不使用回执','永修铜锣湾广场','商管已同意[{account}]作为{merchant}商户的收款账户。后续的销售分成及营销补贴将存入此账户',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(614,'1006','14','商户分账账户不使用回执','欧堡利亚海悦城','商管已同意[{account}]作为{merchant}商户的收款账户。后续的销售分成及营销补贴将存入此账户',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(714,'1007','14','商户分账账户不使用回执','澳林广场','商管已同意[{account}]作为{merchant}商户的收款账户。后续的销售分成及营销补贴将存入此账户',now(),1,0,null);
#商户分账账户不使用回执
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(85,'456','15','商户分账账户使用回执','富茂','商管拒绝将[{account}]作为{merchant}商户的收款账户。如有疑问请联系商管',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(115,'1001','15','商户分账账户使用回执','长融世贸广场','商管拒绝将[{account}]作为{merchant}商户的收款账户。如有疑问请联系商管',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(215,'1002','15','商户分账账户使用回执','同保楼 同福街','商管拒绝将[{account}]作为{merchant}商户的收款账户。如有疑问请联系商管',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(315,'1003','15','商户分账账户使用回执','杭州东站西子国际','商管拒绝将[{account}]作为{merchant}商户的收款账户。如有疑问请联系商管',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(415,'1004','15','商户分账账户使用回执','莱迪1086商业中心','商管拒绝将[{account}]作为{merchant}商户的收款账户。如有疑问请联系商管',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(515,'1005','15','商户分账账户使用回执','永修铜锣湾广场','商管拒绝将[{account}]作为{merchant}商户的收款账户。如有疑问请联系商管',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(615,'1006','15','商户分账账户使用回执','欧堡利亚海悦城','商管拒绝将[{account}]作为{merchant}商户的收款账户。如有疑问请联系商管',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(715,'1007','15','商户分账账户使用回执','澳林广场','商管拒绝将[{account}]作为{merchant}商户的收款账户。如有疑问请联系商管',now(),1,0,null);

+ 0
- 5
mallinkAdmin/src/main/resources/db/migration/V201905081901__UPDATE_SHARIING_RECEIVER.sql Просмотреть файл

@@ -1,5 +0,0 @@
alter table wx_profit_sharing_receiver
modify column is_use smallint(2) default 2 comment '是否使用0使用1不使用2申请';
update wx_profit_sharing_receiver set is_use =0 where status=0;
update wx_profit_sharing_receiver set is_use =1 where status=1;


+ 0
- 4
mallinkAdmin/src/main/resources/db/migration/V201905082030__ADD_COLUMN_PLATENUMBER.sql Просмотреть файл

@@ -1,4 +0,0 @@
ALTER TABLE `wx_car_cmd_log`
ADD COLUMN `plateNumber` VARCHAR(32) GENERATED ALWAYS AS (json_unquote(json_extract(`cmd_json`,'$.plateNumber'))) VIRTUAL AFTER `cmd_json`;
ALTER TABLE `wx_car_cmd_log`
ADD INDEX `idx_plateNumber` (`plateNumber` ASC, `tenant_id` ASC);

+ 0
- 2
mallinkAdmin/src/main/resources/db/migration/V201905091750__CHANGE_COUPON_CHANNEL.sql Просмотреть файл

@@ -1,2 +0,0 @@
update wx_coupon_channel set begin_time = create_date where begin_time is null;
update wx_coupon_channel co, wx_coupon c set co.end_time = c.valid_end_date where co.target_ad != 2 and co.target_ad != 8 and co.coupon_id = c.id and c.valid_type = 1 and co.end_time is null;

+ 0
- 4
mallinkAdmin/src/main/resources/db/migration/V201905091758__L_UPDATE_COUPON_CHANNEL.sql Просмотреть файл

@@ -1,4 +0,0 @@
update wx_coupon_channel c set type = (select type from wx_coupon where id = c.coupon_id ),
business = (select business from wx_coupon where id = c.coupon_id ),
sub_business = (select sub_business from wx_coupon where id = c.coupon_id )
where c.type is null or c.business is null or c.sub_business is null

+ 0
- 24
mallinkAdmin/src/main/resources/db/migration/V201905101050__UPDATE_MSG_MODEL.sql Просмотреть файл

@@ -1,24 +0,0 @@
#商户分账账户删除提醒
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(86,'456','16','商户分账账户删除提醒','富茂','{merchant}商户的收款账户[{account}]于{time}取消绑定,营销活动与销售分成将无法正常进行,请尽快绑定新收款账户',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(116,'1001','16','商户分账账户删除提醒','长融世贸广场','{merchant}商户的收款账户[{account}]于{time}取消绑定,营销活动与销售分成将无法正常进行,请尽快绑定新收款账户',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(216,'1002','16','商户分账账户删除提醒','同保楼 同福街','{merchant}商户的收款账户[{account}]于{time}取消绑定,营销活动与销售分成将无法正常进行,请尽快绑定新收款账户',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(316,'1003','16','商户分账账户删除提醒','杭州东站西子国际','{merchant}商户的收款账户[{account}]于{time}取消绑定,营销活动与销售分成将无法正常进行,请尽快绑定新收款账户',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(416,'1004','16','商户分账账户删除提醒','莱迪1086商业中心','{merchant}商户的收款账户[{account}]于{time}取消绑定,营销活动与销售分成将无法正常进行,请尽快绑定新收款账户',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(516,'1005','16','商户分账账户删除提醒','永修铜锣湾广场','{merchant}商户的收款账户[{account}]于{time}取消绑定,营销活动与销售分成将无法正常进行,请尽快绑定新收款账户',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(616,'1006','16','商户分账账户删除提醒','欧堡利亚海悦城','{merchant}商户的收款账户[{account}]于{time}取消绑定,营销活动与销售分成将无法正常进行,请尽快绑定新收款账户',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(716,'1007','16','商户分账账户删除提醒','澳林广场','{merchant}商户的收款账户[{account}]于{time}取消绑定,营销活动与销售分成将无法正常进行,请尽快绑定新收款账户',now(),1,0,null);

#删除不需要的短信模板
delete from wx_msg_validationcode_model where id in (80,82,110,112,210,212,310,312,410,412,510,512,610,612,710,712);
#商户分账账户新增通知商户内容更新
update wx_msg_validationcode_model set content='您于{time}提交了{merchant}商户的收款账户[{account}]绑定,后续销售分成及营销补贴将存入该账户' where id in(81,111,211,311,411,511,611,711);
#商户分账账户变更通知商户内容更新
update wx_msg_validationcode_model set content='您于{time}将{merchant}商户的收款账户变更为[{account}],后续销售分成及营销补贴将存入该账户' where id in(83,113,213,313,413,513,613,713);

+ 0
- 9
mallinkAdmin/src/main/resources/db/migration/V201905131552__S3_IMG_TABLE.sql Просмотреть файл

@@ -1,9 +0,0 @@
DROP TABLE IF EXISTS `mall_resource` ;
CREATE TABLE `mall_resource` (
`id` bigint(64) NOT NULL,
`tenant_id` varchar(50) DEFAULT NULL COMMENT '租户ID',
`bucket` varchar(20) DEFAULT '' COMMENT 'bucket名称',
`s3_key` varchar(100) DEFAULT NULL COMMENT 's3 key',
`url` varchar(1024) DEFAULT NULL COMMENT 's3 url',
PRIMARY KEY (`id`)
) ENGINE=`InnoDB` ROW_FORMAT=DYNAMIC COMMENT='资源表' CHECKSUM=0 DELAY_KEY_WRITE=0;

+ 0
- 5
mallinkAdmin/src/main/resources/db/migration/V201905131644__L_TRADE.sql Просмотреть файл

@@ -1,5 +0,0 @@
ALTER TABLE wx_merchant_trade_daily
ADD COLUMN trade_count int(10) DEFAULT 0 COMMENT '交易笔数';

ALTER TABLE wx_merchant_trade_daily
ADD COLUMN proof varchar(500) DEFAULT NULL COMMENT '凭证';

+ 0
- 9
mallinkAdmin/src/main/resources/db/migration/V201905131843__UPDATE_TAGS.sql Просмотреть файл

@@ -1,9 +0,0 @@
UPDATE `wx_tags` SET `name` = '活跃度低' WHERE (`id` = '110');
UPDATE `wx_tags` SET `name` = '活跃度中' WHERE (`id` = '111');
UPDATE `wx_tags` SET `name` = '活跃度高' WHERE (`id` = '112');
UPDATE `wx_tags` SET `name` = '消费频率低' WHERE (`id` = '107');
UPDATE `wx_tags` SET `name` = '消费频率中' WHERE (`id` = '108');
UPDATE `wx_tags` SET `name` = '消费频率高' WHERE (`id` = '109');
UPDATE `wx_tags` SET `name` = '实惠型消费' WHERE (`id` = '104');
UPDATE `wx_tags` SET `name` = '享乐型消费' WHERE (`id` = '105');
UPDATE `wx_tags` SET `name` = '品质型消费' WHERE (`id` = '106');

+ 0
- 2
mallinkAdmin/src/main/resources/db/migration/V201905151408__L_ALTER_MERCHANT.sql Просмотреть файл

@@ -1,2 +0,0 @@
ALTER TABLE wx_merchant
ADD COLUMN qr_code varchar(500) DEFAULT NULL COMMENT '二维码地址';

+ 0
- 2
mallinkAdmin/src/main/resources/db/migration/V201905161611__UPATE_BILL.sql Просмотреть файл

@@ -1,2 +0,0 @@
update wx_bill_rent set owe=receive_pay-pay where status in (2,4);
update wx_bill_property set owe=receive_pay-pay where status in(2,4);

+ 0
- 2
mallinkAdmin/src/main/resources/db/migration/V201905161621__ADD_MERCHANT_INTRODUCTION.sql Просмотреть файл

@@ -1,2 +0,0 @@
ALTER TABLE `wx_merchant`
ADD COLUMN `introduction` VARCHAR(2048) NULL DEFAULT NULL AFTER `qr_code`;

+ 0
- 7
mallinkAdmin/src/main/resources/db/migration/V201905171447__ADD_COUPON_COVER_IMG.sql Просмотреть файл

@@ -1,7 +0,0 @@



ALTER TABLE wx_coupon
ADD COLUMN `cover_picture` json DEFAULT null COMMENT '多封面图' after `cover_img`;

UPDATE wx_coupon SET cover_picture=json_array(cover_img) WHERE cover_picture is null;

+ 0
- 7
mallinkAdmin/src/main/resources/db/migration/V201905171614__ADD_CAMPAIGN_COVER_PICTURE.sql Просмотреть файл

@@ -1,7 +0,0 @@



ALTER TABLE wx_campaign
ADD COLUMN `cover_picture` json DEFAULT null COMMENT '多封面图' after `cover_img`;

UPDATE wx_campaign SET cover_picture=json_array(cover_img) WHERE cover_picture is null;

+ 0
- 7
mallinkAdmin/src/main/resources/db/migration/V201905171621__ADD_TOPIC_COVER_PICTURE.sql Просмотреть файл

@@ -1,7 +0,0 @@



ALTER TABLE wx_topic
ADD COLUMN `cover_picture` json DEFAULT null COMMENT '多封面图' after `cover`;

UPDATE wx_topic SET cover_picture=json_array(cover) WHERE cover_picture is null;

+ 0
- 1
mallinkAdmin/src/main/resources/db/migration/V201905171800__L_ALTER_MSG.sql Просмотреть файл

@@ -1 +0,0 @@
update wx_msg_validationcode_model set content = '截止今日{merName}的账单共计欠缴{price}元,请登录{app}小程序查看账单并交费。' where type = 8

+ 0
- 155
mallinkAdmin/src/main/resources/db/migration/V201905181020__CHANGE_PERMISSION.sql Просмотреть файл

@@ -1,155 +0,0 @@
DROP TABLE IF EXISTS `mall_permission` ;
CREATE TABLE `mall_permission` (
`id` bigint(64) NOT NULL,
`name` varchar(32) DEFAULT NULL COMMENT '权限名称',
`parent_id` bigint(64) DEFAULT NULL COMMENT '父编号ID,一级菜单为0',
`available` varchar(1) DEFAULT 'Y' COMMENT '是否可用 Y/N',
`permission` varchar(50) DEFAULT NULL COMMENT '授权(多个用逗号分隔,如:user:list,user:create)',
`resource_type` tinyint(2) DEFAULT NULL COMMENT '资源类型0:目录 1:菜单 2:按钮 3:其它',
`module_color` varchar(10) DEFAULT NULL COMMENT '菜单背景色-1级菜单使用',
`module_color_num` varchar(15) DEFAULT NULL COMMENT '菜单字体颜色-1级菜单使用',
`url` varchar(50) DEFAULT NULL COMMENT '资源路径(user/list or http://localhost/1.html)',
`icon` varchar(50) DEFAULT NULL COMMENT '菜单图标',
`version_type` tinyint(2) DEFAULT NULL COMMENT '版本类型(0:标准版)',
`sort` int(10) DEFAULT NULL COMMENT '排序',
PRIMARY KEY (`id`),
UNIQUE `id_UNIQUE` USING BTREE (`id`) comment ''
) ENGINE=`InnoDB` ROW_FORMAT=DYNAMIC COMMENT='系统权限表(当前到button)' CHECKSUM=0 DELAY_KEY_WRITE=0;

INSERT INTO `mall_permission`
(`id`,`name`, `parent_id`,`available`,`permission`,`resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`,`sort`)
VALUES
(1, '数据塔台', 0, 'Y', null, 0, '#EE7653', '238,118,83', null, null, 0, 1),
(2, '商户商铺', 0, 'Y', null, 0, '#51A9C9', '81,169,201', null, null, 0, 2),
(3, '合同管理', 0, 'Y', null, 0, '#5A76BF', '90,118,191', null, null, 0, 3),
(4, '账单管理', 0, 'Y', null, 0, '#3FC496', '63,196,150', null, null, 0, 4),
(5, '会员系统', 0, 'Y', null, 0, '#6B5EC9', '107,94,201', null, null, 0, 5),
(6, '营销系统', 0, 'Y', null, 0, '#C85963', '200,89,99', null, null, 0, 6),
(7, '账号管理', 0, 'Y', null, 0, '#B23D8B', '178,61,139', null, null, 0, 9),
(8, '移动端数据塔台', 0, 'Y', null, 3, '#B23D8B', '178,61,139', null, null, 0, 8),
(9, '智能硬件', 0, 'Y', null, 0, '#E19549', '225,149,73', null, null, 0, 7),
(10, '首页', 0, 'Y', null, 1, '#E19549', '225,149,73', null, null, 0, 10),
(50, '系统管理', 0, 'Y', null, 0, '#B23D8B', '178,61,139', null, null, 0, 50),

(101, '数据总览', 1, 'Y', null, 1, null, null, 'zonglan', 'icon-fumao-shujuzonglan', 0, 101),
(102, '运营数据', 1, 'Y', null, 1, null, null, 'yunying', 'icon-shuju1', 0, 102),
(103, '客流数据', 1, 'Y', null, 1, null, null, 'keliu', 'icon-shuju', 0, 103),
(104, '车流数据', 1, 'Y', null, 1, null, null, 'cheliu', 'icon-shujuquxianzoushiqushijiantouzhuzhuangtubiao', 0, 104),
(105, '线上营销交易', 1, 'Y', null, 1, null, null, 'yingxiao', 'icon-shuju2', 0, 105),
(106, '用户数据', 1, 'Y', null, 1, null, null, 'huiyuanHome', 'icon-yonghushuju', 0, 106),
(107, 'WIFI使用数据', 1, 'Y', null, 1, null, null, 'wifiuse', 'icon-wifi', 0, 107),

(201, '商铺管理', 2, 'Y', null, 0, null, null, null, 'icon-iconshangpuguanli', 0, 202),
(202, '商户管理', 2, 'Y', null, 0, null, null, null, 'icon-shanghuguanli', 0, 203),
(203, '商户解单', 2, 'Y', null, 1, null, null, 'jiedanList', 'icon-jine', 0, 204),
(204, '商户收银', 2, 'Y', null, 1, null, null, 'merchantCashierList', 'icon-shouyintai', 0, 205),
(205, '品牌管理', 2, 'Y', null, 0, null, null, null, 'icon-pinpaiguanli', 0, 206),
(206, '租赁概览', 2, 'Y', null, 1, null, null, 'dataShoprental', 'icon-chuzu', 0, 201),

(211, '店铺', 201, 'Y', null, 1, null, null, 'shoplist', null, 0, 211),
(212, '多经点位', 201, 'Y', null, 1, null, null, 'pointlist', null, 0, 212),
(221, '店铺商户', 202, 'Y', null, 1, null, null, 'merchantList', null, 0, 221),
(222, '多经点位商户', 202, 'Y', null, 1, null, null, 'pointmerchantList', null, 0, 222),
(251, '品牌列表', 205, 'Y', null, 1, null, null, 'brandlist', null, 0, 251),

(301, '商铺租赁合同', 3, 'Y', null, 1, null, null, 'rentlist', 'icon-zhangdan', 0, 301),
(302, '商铺物业合同', 3, 'Y', null, 1, null, null, 'tenementlist', 'icon-zulinhetong1', 0, 302),
(303, '多经点位租赁合同', 3, 'Y', null, 1, null, null, 'pointrentlist', 'icon-wuyehetong', 0, 303),
(304, '多经点位物业合同', 3, 'Y', null, 1, null, null, 'pointtenementlist', 'icon-changfangwuyehetong', 0, 304),

(401, '账单总览', 4, 'Y', null, 1, null, null, 'collectionRate', 'icon-feiyongshoujiao-', 0, 401),
(402, '商铺租赁账单', 4, 'Y', null, 1, null, null, 'zujinList', 'icon-wodezulinzhangdan', 0, 404),
(403, '商铺物业账单', 4, 'Y', null, 1, null, null, 'propertyList', 'icon-zhangdan1', 0, 405),
(404, '多经点位租赁账单', 4, 'Y', null, 1, null, null, 'pointzujinList', 'icon-zulinhetong', 0, 406),
(405, '多经点位物业账单', 4, 'Y', null, 1, null, null, 'pointpropertyList', 'icon-taizhang', 0, 407),
(406, '日常费用账单', 4, 'Y', null, 1, null, null, 'richangList', 'icon-richangfeiyongbaoxiao', 0, 408),
(407, '其他费用账单', 4, 'Y', null, 1, null, null, 'otherList', 'icon-qita', 0, 409),
(408, '其他押金账单', 4, 'Y', null, 1, null, null, 'otheryajinList', 'icon-yajin', 0, 410),
(409, '交易对账单', 4, 'Y', null, 1, null, null, 'dealbillList', 'icon-zhangdan11', 0, 411),
(410, '分账对账单', 4, 'Y', null, 1, null, null, 'sharingorderList', 'icon-zhangdan3', 0, 412),
(411, '营销补贴管理', 4, 'Y', null, 1, null, null, 'marketingList', 'icon-qian', 0, 413),
(412, '账单列表', 4, 'Y', null, 1, null, null, 'billlist', 'icon-bucaozulin', 0, 402),
(413, '商户账单', 4, 'Y', null, 1, null, null, 'collectionRateList', 'icon-bucaozulin', 0, 403),

(501, '用户概览', 5, 'Y', null, 1, null, null, 'huiyuanHome', 'icon-tubiaochicundaochuSVGshangchuandaoalibaba-', 0, 501),
(502, '用户数量', 5, 'Y', null, 1, null, null, 'huiyuanShuliang', 'icon-yonghuguanli2', 0, 502),
(503, '拓客分析', 5, 'Y', null, 1, null, null, 'huiyuanTuoke', 'icon-tuoke', 0, 503),
(504, '会员结构', 5, 'Y', null, 1, null, null, 'huiyuanJiegou', 'icon-bianjiICONCopy', 0, 504),
(505, '会员列表', 5, 'Y', null, 1, null, null, 'huiyuanList', 'icon-huiyuanliebiao', 0, 505),
(506, '会员成长值', 5, 'Y', null, 0, null, null, null, 'icon-chengchang', 0, 506),
(507, '会员积分', 5, 'Y', null, 0, null, null, null, 'icon-jifen', 0, 507),
(508, '积分商城', 5, 'Y', null, 0, null, null, null, 'icon-jifenshangchengb', 0, 508),
(509, '停车会员', 5, 'Y', null, 1, null, null, 'parkingList', 'icon-tingchechang1', 0, 509),
(511, '等级设置', 506, 'Y', null, 1, null, null, 'czdengji', null, 0, 511),
(512, '规则设置', 506, 'Y', null, 1, null, null, 'czguize', null, 0, 512),
(513, '会员权益', 506, 'Y', null, 1, null, null, 'interestsMembers', null, 0, 513),
(521, '积分兑换', 507, 'Y', null, 1, null, null, 'duihuan', null, 0, 521),
(522, '积分规则', 507, 'Y', null, 1, null, null, 'guize', null, 0, 522),
(523, '积分变更记录', 507, 'Y', null, 1, null, null, 'biangeng', null, 0, 523),
(531, '商城管理', 508, 'Y', null, 1, null, null, 'jifensc', null, 0, 531),
(532, '积分券', 508, 'Y', null, 1, null, null, 'jifenq', null, 0, 532),
(533, '停车券', 508, 'Y', null, 1, null, null, 'tingcheq', null, 0, 533),

(601, '营销统计', 6, 'Y', null, 0, null, null, null, 'icon-stat', 0, 601),
(602, '优惠券', 6, 'Y', null, 0, null, null, null, 'icon-iconfontyouhuiquan', 0, 602),
(603, '购物卡', 6, 'Y', null, 0, null, null, null, 'icon-qiapian', 0, 603),
(604, '营销活动', 6, 'Y', null, 0, null, null, null, 'icon-kanjia', 0, 604),
(605, '主题营销', 6, 'Y', null, 0, null, null, null, 'icon-qian', 0, 605),
(606, '渠道投放', 6, 'Y', null, 0, null, null, null, 'icon-piliangtoufang', 0, 606),
(607, '答题问卷', 6, 'Y', null, 1, null, null, 'questionsettinglist', 'icon-wenjuan', 0, 607),
(608, '场景投放', 6, 'Y', null, 0, null, null, null, 'icon-icon-test', 0, 608),
(609, '精准投放', 6, 'Y', null, 0, null, null, null, 'icon-jingzhuntoufang', 0, 609),
(610, '订单管理', 6, 'Y', null, 0, null, null, 'orderList', 'icon-dingdanguanli', 0, 610),
(611, '疲劳度设置', 6, 'Y', null, 1, null, null, 'pilaodu', 'icon-pilaojiashi', 0, 612),
(612, '营销物料', 6, 'Y', null, 1, null, null, 'xiaochengxupath', 'icon-wuliaoguanli-', 0, 611),

(621, '卡营销数据', 601, 'Y', null, 1, null, null, 'cardSellData', null, 0, 622),
(622, '劵营销数据', 601, 'Y', null, 1, null, null, 'couponSellData', null, 0, 623),
(623, '砍价营销数据', 601, 'Y', null, 1, null, null, 'bargainSellData', null, 0, 624),
(624, '拼团营销数据', 601, 'Y', null, 1, null, null, 'groupSellData', null, 0, 625),
(625, '触达用户数', 601, 'Y', null, 1, null, null, 'chuda', null, 0, 626),
(626, '场景营销数据', 601, 'Y', null, 1, null, null, 'changjing', null, 0, 627),
(627, '营销分析', 601, 'Y', null, 1, null, null, 'dataZonglan', 'icon-wifi', 0, 621),

(641, '通用券', 602, 'Y', null, 1, null, null, 'tongyong', null, 0, 641),
(642, '满减券', 602, 'Y', null, 1, null, null, 'manjianlist', null, 0, 642),
(643, '代金券', 602, 'Y', null, 1, null, null, 'daijinlist', null, 0, 643),
(644, '礼品券', 602, 'Y', null, 1, null, null, 'lipinlist', null, 0, 644),
(645, '停车券', 602, 'Y', null, 1, null, null, 'tingchelist', null, 0, 645),

(651, '消费卡', 603, 'Y', null, 1, null, null, 'introducing', null, 0, 651),

(661, '砍价', 604, 'Y', null, 1, null, null, 'bargainlist', null, 0, 661),
(662, '拼团', 604, 'Y', null, 1, null, null, 'spellgroup', null, 0, 662),

(671, '宣传页', 605, 'Y', null, 1, null, null, 'XuanChuanList', null, 0, 671),
(672, '互动营销游戏', 605, 'Y', null, 1, null, null, 'gamesetting', null, 0, 672),

(673, '广告大屏', 605, 'Y', null, 1, null, null, 'adscreen', null, 0, 673),
(674, '专题', 605, 'Y', null, 1, null, null, 'topictoufang', null, 0, 674),

(681, '列表投放', 606, 'Y', null, 1, null, null, 'xiaochengxu', null, 0, 681),
(682, '限时抢购', 606, 'Y', null, 1, null, null, 'flashsale', null, 0, 682),
(683, '购物卡频道', 606, 'Y', null, 1, null, null, 'introcardput', null, 0, 683),
(684, '砍价', 606, 'Y', null, 1, null, null, 'bargainCoupon', null, 0, 684),
(685, '拼团', 606, 'Y', null, 1, null, null, 'groupbooktoufang', null, 0, 685),

(691, '停车发券', 608, 'Y', null, 1, null, null, 'tingchetoufang', null, 0, 691),
(692, '核销发券', 608, 'Y', null, 1, null, null, 'hexiaotoufang', null, 0, 692),
(693, '收银台发券', 608, 'Y', null, 1, null, null, 'paymentb', null, 0, 693),
(694, '交易发劵', 608, 'Y', null, 1, null, null, 'buycoupon', null, 0, 694),

(701, '精准发券', 609, 'Y', null, 1, null, null, 'jingzhuntoufang', null, 0, 701),
(702, '标签短信', 609, 'Y', null, 1, null, null, 'msglist', null, 0, 702),

(711, '劵订单', 610, 'Y', null, 1, null, null, 'orderList', null, 0, 711),
(712, '卡订单', 610, 'Y', null, 1, null, null, 'sellingCardRecord', null, 0, 712),
(713, '卡消费订单', 610, 'Y', null, 1, null, null, 'consumRecord', null, 0, 713),

(901, '角色管理', 7, 'Y', null, 1, null, null, 'ruleList', 'icon-navicon-yhgl', 0, 901),
(902, '用户管理', 7, 'Y', null, 1, null, null, 'userList', 'icon-yonghuguanli', 0, 902),

(951, '广告大屏', 9, 'Y', null, 0, null, null, 'bigScreentList', 'icon-navicon-yhgl', 0, 951),
(961, '大屏管理', 951, 'Y', null, 1, null, null, 'bigScreentList', null, 0, 961)

;

+ 0
- 2
mallinkAdmin/src/main/resources/db/migration/V201905191020__CHANGE_TEMPLATE_MSG.sql Просмотреть файл

@@ -1,2 +0,0 @@
ALTER TABLE wx_template_msg
ADD COLUMN `custom_param` json DEFAULT null COMMENT '自定义参数' after `type`;

+ 0
- 17
mallinkAdmin/src/main/resources/db/migration/V201905201046__UPDATE_TEMPLATE_MSG.sql Просмотреть файл

@@ -1,17 +0,0 @@

ALTER TABLE `wx_template_msg` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;

UPDATE wx_template_msg
SET custom_param=
'{"index":["keyword1","keyword2","keyword3","keyword4","keyword5","keyword6","keyword7"],"keyword1":"可抵{keyword1}元","keyword2":"{keyword2}","keyword3":"{keyword3}","keyword4":"{keyword4}","keyword5":"{keyword5}元","keyword6":"{keyword6}","keyword7":"猜也猜不到的优惠,只有幸运的人才能看到,就是你,{keyword7}\\n☟☟☟☟☟☟☟\\n☞ 快看看 ☜\\n☝︎☝︎☝︎☝︎☝︎☝︎☝︎\\n","emphasis":"keyword1.DATA"}'
WHERE type = 1;

UPDATE wx_template_msg
SET custom_param='{"index":["keyword1","keyword2","keyword3","keyword4"],"keyword1":"可抵{keyword1}元","keyword2":"{keyword2}","keyword3":"{keyword3}","keyword4":"猜也猜不到的优惠,只有幸运的人才能看到,就是你,{keyword4}\\n☟☟☟☟☟☟☟\\n☞ 快看看 ☜\\n☝︎☝︎☝︎☝︎☝︎☝︎☝︎\\n","emphasis":"keyword1.DATA"}'
WHERE type = 2;
UPDATE wx_template_msg
SET custom_param='{"url":"http://iformall.com","index":["first","keyword1","keyword2","keyword3","remark"],"first":"商家{first}的券被核销","keyword1":"{keyword1}","keyword2":"{keyword2}","keyword3":"{keyword3}","remark":"猜也猜不到的优惠,只有幸运的人才能看到,就是你,{remark}\\n☟☟☟☟☟☟☟\\n☞ 快看看 ☜\\n☝︎☝︎☝︎☝︎☝︎☝︎☝︎\\n"}'
WHERE type = 102;
UPDATE wx_template_msg
SET custom_param='{"url":"http://iformall.com","index":["first","keyword1","keyword2","keyword3","keyword4","keyword5","remark"],"first":"您有新的惊喜,请点详情查看","keyword1":"{keyword1}","keyword2":"{keyword2}","keyword3":"{keyword3}","keyword4":"{keyword4}","keyword5":"{keyword5}","remark":"猜也猜不到的优惠,只有幸运的人才能看到,就是你,{remark}\\n☟☟☟☟☟☟☟\\n☞ 快看看 ☜\\n☝︎☝︎☝︎☝︎☝︎☝︎☝︎\\n"}'
WHERE type = 103;

+ 0
- 5
mallinkAdmin/src/main/resources/db/migration/V201905201108__L_ALTER_RENT.sql Просмотреть файл

@@ -1,5 +0,0 @@
ALTER TABLE wx_property_contract
ADD COLUMN price_unit int(1) DEFAULT NULL COMMENT '租金单位1日2月3年';

ALTER TABLE wx_rent_contract
ADD COLUMN price_unit int(1) DEFAULT NULL COMMENT '租金单位1日2月3年';

+ 0
- 7
mallinkAdmin/src/main/resources/db/migration/V201905201349__ADD_COUPON_DETAIL_IMG.sql Просмотреть файл

@@ -1,7 +0,0 @@



ALTER TABLE wx_coupon
ADD COLUMN `detail_picture` json DEFAULT null COMMENT '详情多图' after `cover_picture`;

UPDATE wx_coupon SET detail_picture='[]' WHERE detail_picture is null;

+ 0
- 7
mallinkAdmin/src/main/resources/db/migration/V201905201350__ADD_CAMPAIGN_DETAIL_PICTURE.sql Просмотреть файл

@@ -1,7 +0,0 @@



ALTER TABLE wx_campaign
ADD COLUMN `detail_picture` json DEFAULT null COMMENT '详情多图' after `cover_picture`;

UPDATE wx_campaign SET detail_picture='[]' WHERE detail_picture is null;

+ 0
- 7
mallinkAdmin/src/main/resources/db/migration/V201905201351__ADD_TOPIC_DETAIL_PICTURE.sql Просмотреть файл

@@ -1,7 +0,0 @@



ALTER TABLE wx_topic
ADD COLUMN `detail_picture` json DEFAULT null COMMENT '详情多图' after `cover_picture`;

UPDATE wx_topic SET detail_picture='[]' WHERE detail_picture is null;

+ 0
- 1
mallinkAdmin/src/main/resources/db/migration/V201905211335__L_ALTER_RENT.sql Просмотреть файл

@@ -1 +0,0 @@
update wx_msg_validationcode_model set model_id=500 where name in( '审批通知','待办通知','欠缴账单通知','驳回通知','审批通过通知','待缴账单通知')

+ 0
- 5
mallinkAdmin/src/main/resources/db/migration/V201905211601__L_ALTER_RENT.sql Просмотреть файл

@@ -1,5 +0,0 @@
ALTER TABLE wx_property_contract
ADD COLUMN rent_price int(11) DEFAULT 0 COMMENT '多径租金单价(其他放rentInfo)';

ALTER TABLE wx_rent_contract
ADD COLUMN rent_price int(11) DEFAULT 0 COMMENT '多径租金单价(其他放rentInfo)';

+ 0
- 2
mallinkAdmin/src/main/resources/db/migration/V201905231016__ADD_MERCHANT_ACTION.sql Просмотреть файл

@@ -1,2 +0,0 @@
ALTER TABLE `wx_merchant`
ADD COLUMN `action_desc` VARCHAR(2048) NULL DEFAULT NULL AFTER `introduction`;

+ 0
- 2
mallinkAdmin/src/main/resources/db/migration/V201905231052__L_ALTER_RENT.sql Просмотреть файл

@@ -1,2 +0,0 @@
update wx_property_contract set price_unit = (case when adjust_period = 1 then 1 else 2 end) ;
update wx_rent_contract set price_unit = (case when adjust_period = 1 then 1 else 2 end) ;

+ 0
- 2
mallinkAdmin/src/main/resources/db/migration/V201905251112__ADD_INDEX_FOR_MALL_USER.sql Просмотреть файл

@@ -1,2 +0,0 @@
ALTER TABLE `mall_user_info`
ADD INDEX `index_name` (`name` ASC);

+ 0
- 2
mallinkAdmin/src/main/resources/db/migration/V201905251514__L_ALTER_RENT.sql Просмотреть файл

@@ -1,2 +0,0 @@
ALTER TABLE wx_coupon_channel
ADD COLUMN qr_code VARCHAR(500) DEFAULT NULL COMMENT '二维码';

+ 0
- 1
mallinkAdmin/src/main/resources/db/migration/V201905271447__L_ALTER_MSG.sql Просмотреть файл

@@ -1 +0,0 @@
update wx_msg_validationcode_model set content = '{merName}当期的待缴账单为{price}元,截止日期为{date} ,请登录{app}小程序查看账单并交费。' where type = 7

+ 0
- 2
mallinkAdmin/src/main/resources/db/migration/V201905281000__ADD_SCREENSHOT_FOR_AUDIT.sql Просмотреть файл

@@ -1,2 +0,0 @@
ALTER TABLE `wx_weapp_audit_status`
ADD COLUMN `screen_shot` VARCHAR(250) NULL DEFAULT NULL AFTER `audit_err_code`;

+ 0
- 2
mallinkAdmin/src/main/resources/db/migration/V201905291742___RENT_CONTRACT.sql Просмотреть файл

@@ -1,2 +0,0 @@
ALTER TABLE `wx_rent_contract`
ADD COLUMN `subject_name` varchar(200) DEFAULT NULL COMMENT '主体名称';

+ 0
- 1
mallinkAdmin/src/main/resources/db/migration/V201905301150___MERCHANT_UPDATE.sql Просмотреть файл

@@ -1 +0,0 @@
update wx_merchant set cover_picture=json_array(img_url) where img_url is not null and (cover_picture is null or cover_picture='');

+ 0
- 3
mallinkAdmin/src/main/resources/db/migration/V201905301325___UPDATE_MENU_ICON.sql Просмотреть файл

@@ -1,3 +0,0 @@
UPDATE `mall_permission` SET icon = 'icon-zhangdan4' WHERE id = 401;
UPDATE `mall_permission` SET icon = 'icon-zhangdanmingxi' WHERE id = 412;
UPDATE `mall_permission` SET icon = 'icon-zhangdan5' WHERE id = 402;

+ 0
- 53
mallinkAdmin/src/main/resources/db/migration/V201905301346__ADD_SYS_MONITOR.sql Просмотреть файл

@@ -1,53 +0,0 @@
DROP TABLE IF EXISTS `sys_monitor`;
CREATE TABLE `sys_monitor` (
`id` bigint(20) NOT NULL,
`name` varchar(50) NOT NULL COMMENT '网址名称',
`url` varchar(255) NOT NULL COMMENT '网址url',
`type` tinyint(2) DEFAULT '1' COMMENT '1=网址监控',
`deploy` tinyint(2) DEFAULT '1' COMMENT '1=dev 2=test 3=release',
`enable` tinyint(2) DEFAULT '0' COMMENT '0:enable 1:disable',
`err_msg` varchar(50) DEFAULT NULL COMMENT '错误信息',
PRIMARY KEY (`id`),
UNIQUE `id_UNIQUE` USING BTREE (`id`) comment ''
) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='网络监控' CHECKSUM=0 DELAY_KEY_WRITE=0;

INSERT INTO `sys_monitor` (`id`,`name`,`url`,`type`,`deploy`,`enable`,`err_msg`) VALUES
(1, "dev-管理端","https://mall.youlane.cn/api/version", 1, 1, 1, "{name}: {url} 不响应"),
(2, "dev-C端","https://ciformall.youlane.cn/C/api/mall/version", 1, 1, 1, "{name}: {url} 不响应"),
(3, "dev-B端","https://biformall.youlane.cn/B/api/mall/version", 1, 1, 1, "{name}: {url} 不响应"),
(4, "dev-Schedule","http://202.165.179.86:5000/S/version", 1, 1, 1, "{name}: {url} 不响应"),
(5, "dev-消息服务器","http://202.165.179.86:5001/mq/version", 1, 1, 1, "{name}: {url} 不响应"),
(6, "dev-websocket服务器","http://202.165.179.86:7100/W/version", 1, 1, 1, "{name}: {url} 不响应"),
(7, "dev-微信第三方开放平台","https://open.youlane.cn/O/version", 1, 1, 1, "{name}: {url} 不响应"),
(8, "dev-移动端数据塔台","https://mobile.youlane.cn/#/", 1, 1, 1, "{name}: {url} 不响应"),
(9, "dev-幸运卡牌","https://game.youlane.cn/luckCard/index.html", 1, 1, 1, "{name}: {url} 不响应"),
(10, "dev-幸运砸金蛋","https://game.youlane.cn/goldEgg/index.html", 1, 1, 1, "{name}: {url} 不响应"),
(11, "dev-幸运刮刮乐","https://game.youlane.cn/guaguale/index.html", 1, 1, 1, "{name}: {url} 不响应"),
(12, "dev-callback","http://202.165.179.86:9100/version", 1, 1, 1, "{name}: {url} 不响应"),

(101, "test-管理端","https://admintest.malls.iformall.com/api/version", 1, 2, 0, "{name}: {url} 不响应"),
(102, "test-C端","https://ctest.malls.iformall.com/C/api/mall/version", 1, 2, 0, "{name}: {url} 不响应"),
(103, "test-B端","https://btest.malls.iformall.com/B/api/mall/version", 1, 2, 0, "{name}: {url} 不响应"),
(104, "test-Schedule","https://stest.malls.iformall.com/S/version", 1, 2, 0, "{name}: {url} 不响应"),
(105, "test-消息服务器","https://stest.malls.iformall.com/mq/version", 1, 2, 0, "{name}: {url} 不响应"),
(106, "test-websocket服务器","https://stest.malls.iformall.com/W/version", 1, 2, 0, "{name}: {url} 不响应"),
(107, "test-微信第三方开放平台","https://opentest.malls.iformall.com/O/version", 1, 2, 0, "{name}: {url} 不响应"),
(108, "test-移动端数据塔台","https://mobiletest.malls.iformall.com/#/", 1, 2, 0, "{name}: {url} 不响应"),
(109, "test-幸运卡牌","https://gametest.malls.iformall.com/game/luckCard/index.html", 1, 2, 0, "{name}: {url} 不响应"),
(110, "test-幸运砸金蛋","https://gametest.malls.iformall.com/game/goldEgg/index.html", 1, 2, 0, "{name}: {url} 不响应"),
(111, "test-幸运刮刮乐","https://gametest.malls.iformall.com/game/guaguale/index.html", 1, 2, 0, "{name}: {url} 不响应"),
(112, "test-callback","https://callbacktest.malls.iformall.com/api/version", 1, 2, 0, "{name}: {url} 不响应"),

(201, "生产环境-管理端","https://admin.malls.iformall.com/api/version", 1, 3, 0, "{name}: {url}不响应"),
(202, "生产环境-C端","https://c.malls.iformall.com/C/api/mall/version", 1, 3, 0, "{name}: {url} 不响应"),
(203, "生产环境-B端","https://b.malls.iformall.com/B/api/mall/version", 1, 3, 0, "{name}: {url}不响应"),
(204, "生产环境-Schedule","https://s.malls.iformall.com/S/version", 1, 3, 0, "{name}: {url}不响应"),
(205, "生产环境-消息服务器","https://s.malls.iformall.com/mq/version", 1, 3, 0, "{name}: {url}不响应"),
(206, "生产环境-websocket服务器","https://s.malls.iformall.com/W/version", 1, 3, 0, "{name}: {url}不响应"),
(207, "生产环境-微信第三方开放平台","https://open.malls.iformall.com/O/version", 1, 3, 0, "{name}: {url}不响应"),
(208, "生产环境-移动端数据塔台","https://mobile.malls.iformall.com/#/", 1, 3, 0, "{name}: {url}不响应"),
(209, "生产环境-幸运卡牌","https://game.malls.iformall.com/game/luckCard/index.html", 1, 3, 0, "{name}: {url}不响应"),
(210, "生产环境-幸运砸金蛋","https://game.malls.iformall.com/game/goldEgg/index.html", 1, 3, 0, "{name}: {url}不响应"),
(211, "生产环境-幸运刮刮乐","https://game.malls.iformall.com/game/guaguale/index.html", 1, 3, 0, "{name}: {url}不响应"),
(212, "生产环境-callback","https://callback.malls.iformall.com/api/version", 1, 3, 0, "{name}: {url}不响应")
;

+ 0
- 2
mallinkAdmin/src/main/resources/db/migration/V201905301400___PROPERTY_CONTRACT.sql Просмотреть файл

@@ -1,2 +0,0 @@
ALTER TABLE `wx_property_contract`
ADD COLUMN `subject_name` varchar(200) DEFAULT NULL COMMENT '主体名称';

+ 22
- 0
mallinkAdmin/src/main/resources/db/migration/V201906041320__ADD_ACTIVITY_TABLE.sql Просмотреть файл

@@ -0,0 +1,22 @@
drop table if exists `wx_activity`;
CREATE TABLE IF NOT EXISTS `wx_activity` (
`id` bigint(20) NOT NULL COMMENT '主键ID',
`tenant_id` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID',
`cover_img` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '封面图',
`title` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '活动名称',
`sub_title` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '副标题',
`detail` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '活动正文',
`html` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '富文本',
`person_limit` int(11) NOT NULL COMMENT '报名人数',
`activity_time` datetime NOT NULL COMMENT '活动时间',
`useCredit` smallint(2) DEFAULT 0 COMMENT '使用积分1是0否',
`credit` int(11) DEFAULT 0 COMMENT '消耗积分',
`type` smallint(2) NOT NULL COMMENT '类型 1固定格式2自由图文',
`status` smallint(2) NOT NULL COMMENT '状态0上线 1下线',
`start_time` datetime NOT NULL COMMENT '活动开始显示时间',
`end_time` datetime NOT NULL COMMENT '活动结束显示时间',
`create_time` datetime NOT NULL COMMENT '创建时间',
`update_time` datetime NOT NULL COMMENT '更新时间',
PRIMARY KEY (`id`),
INDEX `id_index` USING BTREE (`id`) comment ''
) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='活动表' CHECKSUM=0 DELAY_KEY_WRITE=0;

mallinkAdmin/src/main/resources/db/migration/V201905171131__ADD_SALE_TYPE.sql → mallinkAdmin/src/main/resources/db/migration/V201906041506__ADD_MENU.sql Просмотреть файл

@@ -1,8 +1,14 @@
INSERT INTO `mall_permission`
(`id`,`name`, `parent_id`,`available`,`permission`,`resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`,`sort`)
VALUES
(663, '活动报名', 604, 'Y', null, 1, null, null, 'regActivityList', null, 0, 663);


DROP TABLE IF EXISTS `mall_sale_type` ;
CREATE TABLE `mall_sale_type` (
`id` bigint(64) NOT NULL,
`name` varchar(32) DEFAULT NULL COMMENT '销售类型',
`type` tinyint(2) DEFAULT NULL COMMENT '资源类型1:标准版 2:速享版 3.营销版',
`type` tinyint(2) DEFAULT NULL COMMENT '资源类型1:尊享全能版 2:尊享营销版 3.速享版',
`period` tinyint(2) DEFAULT NULL COMMENT '有效期(单位月)',
`menus` json DEFAULT NULL COMMENT '菜单列表',
PRIMARY KEY (`id`),
@@ -13,13 +19,13 @@ INSERT INTO `mall_sale_type`
(`id`,`name`, `type`, `period`, `menus`)
VALUES
(1, '尊享全能版', 1, 12,
'[1,2,3,4,5,6,7,8,9,10,101,102,103,104,105,106,107,201,202,203,204,205,206,211,212,221,222,251,301,302,303,304,401,402,403,404,405,406,407,408,409,410,411,412,413,501,502,503,504,505,506,507,508,509,511,512,513,521,522,523,531,532,533,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,627,641,642,643,644,645,651,661,662,671,672,673,674,681,682,683,684,685,691,692,693,694,701,702,711,712,713,901,902,951,961]'
'[1,2,3,4,5,6,7,8,9,10,101,102,103,104,105,106,107,201,202,203,204,205,206,211,212,221,222,251,301,302,303,304,401,402,403,404,405,406,407,408,409,410,411,412,413,501,502,503,504,505,506,507,508,509,511,512,513,521,522,523,531,532,533,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,627,641,642,643,644,645,651,661,662,663,671,672,673,674,681,682,683,684,685,691,692,693,694,701,702,711,712,713,901,902,951,961]'
),
(2, '尊享营销版', 2, 12,
'[1,2,4,5,6,7,8,9,10,101,102,103,104,105,106,107,201,202,203,204,205,211,212,221,222,251,409,410,411,501,502,503,504,505,506,507,508,509,511,512,513,521,522,523,531,532,533,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,627,641,642,643,644,645,651,661,662,671,672,673,674,681,682,683,684,685,691,692,693,694,701,702,711,712,713,901,902,951,961]'
'[1,2,4,5,6,7,8,9,10,101,102,103,104,105,106,107,201,202,203,204,205,211,212,221,222,251,409,410,411,501,502,503,504,505,506,507,508,509,511,512,513,521,522,523,531,532,533,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,627,641,642,643,644,645,651,661,662,663,671,672,673,674,681,682,683,684,685,691,692,693,694,701,702,711,712,713,901,902,951,961]'
),
(3, '速享版', 3, 1,
'[2,4,5,6,7,10,201,202,205,211,212,221,222,251,409,410,411,501,502,503,504,505,506,507,508,511,512,513,521,522,523,531,532,533,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,641,642,643,644,645,651,661,662,671,672,673,674,681,682,683,684,685,691,692,693,694,701,702,711,712,713,901,902]'
'[2,4,5,6,7,10,201,202,205,211,212,221,222,251,409,410,411,501,502,503,504,505,506,507,508,511,512,513,521,522,523,531,532,533,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,641,642,643,644,645,651,661,662,663,671,672,673,674,681,682,683,684,685,691,692,693,694,701,702,711,712,713,901,902]'
)

;

+ 20
- 0
mallinkAdmin/src/main/resources/db/migration/V201906041700__ADD_CAMPAIGN_JOIN.sql Просмотреть файл

@@ -0,0 +1,20 @@
drop table if exists `wx_campaign_join`;
CREATE TABLE IF NOT EXISTS `wx_campaign_join` (
`id` bigint(20) NOT NULL COMMENT '主键ID',
`tenant_id` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID',
`user_id` bigint(20) NOT NULL COMMENT 'C端用户ID',
`campaign_id` bigint(20) NOT NULL COMMENT '活动ID',
`name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '姓名',
`nick_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '昵称',
`birthday` datetime COMMENT '生日',
`sex` smallint(2) DEFAULT 0 COMMENT '性别0保密1男2女',
`address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '地址',
`answer` json NOT NULL COMMENT '答案',
`sign_in` smallint(2) DEFAULT 0 COMMENT '签到状态1签到0未签到',
`status` smallint(2) DEFAULT 0 COMMENT '状态0未确认-报名中1确认-报名成功2取消-报名失败3过期',
`create_time` datetime NOT NULL COMMENT '创建时间',
`update_time` datetime NOT NULL COMMENT '更新时间',
PRIMARY KEY (`id`),
INDEX `id_index` USING BTREE (`id`) comment ''
) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='活动报名表' CHECKSUM=0 DELAY_KEY_WRITE=0;


+ 1
- 0
mallinkAdmin/src/main/resources/db/migration/V201906041735__ALTER_CAMPAIGN_JOIN.sql Просмотреть файл

@@ -0,0 +1 @@
alter table `wx_campaign_join` add column phone varchar(15) NOT NULL COMMENT '手机号';

+ 1
- 0
mallinkAdmin/src/main/resources/db/migration/V201906041745__ALTER_ACTIVITY_TABLE.sql Просмотреть файл

@@ -0,0 +1 @@
drop table if exists `wx_activity`;

+ 2
- 0
mallinkAdmin/src/main/resources/db/migration/V201906051308__L_ALTER_RENT.sql Просмотреть файл

@@ -0,0 +1,2 @@
alter table wx_brand
add column `is_del` SMALLINT(1) DEFAULT 0 COMMENT '是否删除1是0否';

+ 18
- 0
mallinkAdmin/src/main/resources/db/migration/V201906051345__ADD_MSG_MODEL.sql Просмотреть файл

@@ -0,0 +1,18 @@
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(87,'456','17','限时活动报名成功','富茂','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(117,'1001','17','限时活动报名成功','长融世贸广场','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(217,'1002','17','限时活动报名成功','同保楼 同福街','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(317,'1003','17','限时活动报名成功','杭州东站西子国际','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(417,'1004','17','限时活动报名成功','莱迪1086商业中心','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(517,'1005','17','限时活动报名成功','永修铜锣湾广场','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(617,'1006','17','限时活动报名成功','欧堡利亚海悦城','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(717,'1007','17','限时活动报名成功','澳林广场','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(1000000001,'789','17','限时活动报名成功','富茂','亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。',now(),1,0,null);

+ 18
- 0
mallinkAdmin/src/main/resources/db/migration/V201906051346__ADD_MSG_MODEL.sql Просмотреть файл

@@ -0,0 +1,18 @@
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(88,'456','18','限时活动参加提醒','富茂','亲爱的{person},{party}活动将在{time}准时开始,感谢您能够抽出宝贵时间准时到活动现场参与,谢谢。',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(118,'1001','18','限时活动参加提醒','长融世贸广场','亲爱的{person},{party}活动将在{time}准时开始,感谢您能够抽出宝贵时间准时到活动现场参与,谢谢。',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(218,'1002','18','限时活动参加提醒','同保楼 同福街','亲爱的{person},{party}活动将在{time}准时开始,感谢您能够抽出宝贵时间准时到活动现场参与,谢谢。',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(318,'1003','18','限时活动参加提醒','杭州东站西子国际','亲爱的{person},{party}活动将在{time}准时开始,感谢您能够抽出宝贵时间准时到活动现场参与,谢谢。',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(418,'1004','18','限时活动参加提醒','莱迪1086商业中心','亲爱的{person},{party}活动将在{time}准时开始,感谢您能够抽出宝贵时间准时到活动现场参与,谢谢。',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(518,'1005','18','限时活动参加提醒','永修铜锣湾广场','亲爱的{person},{party}活动将在{time}准时开始,感谢您能够抽出宝贵时间准时到活动现场参与,谢谢。',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(618,'1006','18','限时活动参加提醒','欧堡利亚海悦城','亲爱的{person},{party}活动将在{time}准时开始,感谢您能够抽出宝贵时间准时到活动现场参与,谢谢。',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(718,'1007','18','限时活动参加提醒','澳林广场','亲爱的{person},{party}活动将在{time}准时开始,感谢您能够抽出宝贵时间准时到活动现场参与,谢谢。',now(),1,0,null);
insert into wx_msg_validationcode_model(id,tenant_id,type,name,signature,content,createtime,status,minutes,model_id)
values(1000000002,'789','18','限时活动参加提醒','富茂','亲爱的{person},{party}活动将在{time}准时开始,感谢您能够抽出宝贵时间准时到活动现场参与,谢谢。',now(),1,0,null);

+ 2
- 0
mallinkAdmin/src/main/resources/db/migration/V201906051403__L_ALTER_RENT.sql Просмотреть файл

@@ -0,0 +1,2 @@
alter table wx_merchant
add column `is_del` SMALLINT(1) DEFAULT 0 COMMENT '是否删除1是0否';

+ 2
- 0
mallinkAdmin/src/main/resources/db/migration/V201906051500__ALTER_CAMPAIGN_JOIN.sql Просмотреть файл

@@ -0,0 +1,2 @@
alter table wx_campaign_join add column img_url json COMMENT '图片';
update wx_campaign_join set img_url=json_array();

+ 2
- 0
mallinkAdmin/src/main/resources/db/migration/V201906051530__ALTER_CAMPAIGN.sql Просмотреть файл

@@ -0,0 +1,2 @@
alter table wx_campaign add column `activity_end_time` datetime COMMENT '活动结束时间',
change column `activity_time` activity_start_time datetime COMMENT '活动开始时间';

+ 7
- 0
mallinkAdmin/src/main/resources/db/migration/V201906051702__ALTER_CAMPAIGN.sql Просмотреть файл

@@ -0,0 +1,7 @@
ALTER TABLE `wx_campaign`
ADD COLUMN `produce_type` SMALLINT(2) NULL DEFAULT NULL COMMENT '产品类型,类型3适用(1-券,2-报名)',
ADD COLUMN `produce_id` BIGINT(20) NULL DEFAULT NULL COMMENT '产品ID,类型3适用',
ADD COLUMN `page_path` VARCHAR(50) NULL DEFAULT NULL COMMENT '小程序跳转路径,类型3适用',
ADD COLUMN `page_scene` VARCHAR(50) NULL DEFAULT NULL COMMENT '小程序跳转二维码,类型3适用',
CHANGE COLUMN `type` `type` SMALLINT(11) NULL DEFAULT NULL COMMENT '类型 1-固定格式,2-自由图文,3-小程序路径' ;


+ 32
- 0
mallinkAdmin/src/main/resources/db/migration/V201906051712__ADD_MENU.sql Просмотреть файл

@@ -0,0 +1,32 @@
INSERT INTO `mall_permission`
(`id`,`name`, `parent_id`,`available`,`permission`,`resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`,`sort`)
VALUES
(903, '审批管理', 7, 'Y', null, 0, null, null, null, 'icon-shenpiguanli', 0, 903),
(931, '流程模板', 903, 'Y', null, 1, null, null, 'processTemplate', null, 0, 931),
(932, '类型设置', 903, 'Y', null, 1, null, null, 'processTypeSet', null, 0, 932);

DROP TABLE IF EXISTS `mall_sale_type` ;
CREATE TABLE `mall_sale_type` (
`id` bigint(64) NOT NULL,
`name` varchar(32) DEFAULT NULL COMMENT '销售类型',
`type` tinyint(2) DEFAULT NULL COMMENT '资源类型1:尊享全能版 2:尊享营销版 3.速享版',
`period` tinyint(2) DEFAULT NULL COMMENT '有效期(单位月)',
`menus` json DEFAULT NULL COMMENT '菜单列表',
PRIMARY KEY (`id`),
UNIQUE `id_UNIQUE` USING BTREE (`id`) comment ''
) ENGINE=`InnoDB` ROW_FORMAT=DYNAMIC COMMENT='系统销售表' CHECKSUM=0 DELAY_KEY_WRITE=0;

INSERT INTO `mall_sale_type`
(`id`,`name`, `type`, `period`, `menus`)
VALUES
(1, '尊享全能版', 1, 12,
'[1,2,3,4,5,6,7,8,9,10,101,102,103,104,105,106,107,201,202,203,204,205,206,211,212,221,222,251,301,302,303,304,401,402,403,404,405,406,407,408,409,410,411,412,413,501,502,503,504,505,506,507,508,509,511,512,513,521,522,523,531,532,533,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,627,641,642,643,644,645,651,661,662,663,671,672,673,674,681,682,683,684,685,691,692,693,694,701,702,711,712,713,901,902,903,931,932,951,961]'
),
(2, '尊享营销版', 2, 12,
'[1,2,4,5,6,7,8,9,10,101,102,103,104,105,106,107,201,202,203,204,205,211,212,221,222,251,409,410,411,501,502,503,504,505,506,507,508,509,511,512,513,521,522,523,531,532,533,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,627,641,642,643,644,645,651,661,662,663,671,672,673,674,681,682,683,684,685,691,692,693,694,701,702,711,712,713,901,902,903,931,932,951,961]'
),
(3, '速享版', 3, 1,
'[2,4,5,6,7,10,201,202,205,211,212,221,222,251,409,410,411,501,502,503,504,505,506,507,508,511,512,513,521,522,523,531,532,533,601,602,603,604,605,606,607,608,609,610,611,612,621,622,623,624,625,626,641,642,643,644,645,651,661,662,663,671,672,673,674,681,682,683,684,685,691,692,693,694,701,702,711,712,713,901,902,903,931,932]'
)

;

Некоторые файлы не были показаны из-за большого количества измененных файлов

Загрузка…
Отмена
Сохранить