diff --git a/src/main/java/com/gszc/controller/MiniCustomController.java b/src/main/java/com/gszc/controller/MiniCustomController.java index 6db5f9e..adfec32 100644 --- a/src/main/java/com/gszc/controller/MiniCustomController.java +++ b/src/main/java/com/gszc/controller/MiniCustomController.java @@ -7,10 +7,7 @@ import com.gszc.entity.Custom; import com.gszc.entity.CustomSupport; import com.gszc.service.CountService; import com.gszc.service.impl.CustomServiceImpl; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -30,7 +27,7 @@ public class MiniCustomController { @ApiImplicitParam(name = "token", value = "token", required = true, dataType = "String", paramType = "header") @ApiOperation(value = "公司注册", notes = "公司注册") @ResponseBody - public Result customRegister(@ModelAttribute @Valid Custom custom, List customSupports) { + public Result customRegister(@ModelAttribute @Valid Custom custom,@ApiParam(name = "customSupports", value = "股东列表", required = true) @RequestBody List customSupports) { customService.customRegister(custom,customSupports); return ResultBuilder.success().build(); } diff --git a/src/main/java/com/gszc/service/CountService.java b/src/main/java/com/gszc/service/CountService.java index c6eeced..e962004 100644 --- a/src/main/java/com/gszc/service/CountService.java +++ b/src/main/java/com/gszc/service/CountService.java @@ -1,7 +1,5 @@ package com.gszc.service; -import com.alibaba.fastjson.JSONObject; -import org.mockito.Mock; import org.springframework.stereotype.Service; import java.math.BigDecimal; diff --git a/src/main/java/com/gszc/service/MiniAppService.java b/src/main/java/com/gszc/service/MiniAppService.java index 72231a8..0c8fe90 100644 --- a/src/main/java/com/gszc/service/MiniAppService.java +++ b/src/main/java/com/gszc/service/MiniAppService.java @@ -11,6 +11,7 @@ import com.gszc.mapper.MiniUserMapper; import me.chanjar.weixin.common.error.WxErrorException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.HashMap; @@ -19,6 +20,7 @@ import java.util.Map; import java.util.UUID; @Service +@Transactional public class MiniAppService { final WxMaService wxService = WxMaConfiguration.getMaService("wxb3f8c04dd0f5922f"); diff --git a/src/main/java/com/gszc/service/impl/CustomServiceImpl.java b/src/main/java/com/gszc/service/impl/CustomServiceImpl.java index 8c7c1d3..bcd5304 100644 --- a/src/main/java/com/gszc/service/impl/CustomServiceImpl.java +++ b/src/main/java/com/gszc/service/impl/CustomServiceImpl.java @@ -10,6 +10,7 @@ import com.gszc.mapper.CustomSupportMapper; import com.gszc.service.ICustomService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.List; @@ -24,6 +25,7 @@ import java.util.UUID; * @since 2020-04-27 */ @Service +@Transactional public class CustomServiceImpl extends ServiceImpl implements ICustomService { @Autowired @@ -38,13 +40,15 @@ public class CustomServiceImpl extends ServiceImpl impleme custom.setCreateDate(LocalDateTime.now()); custom.setModifyDate(LocalDateTime.now()); customMapper.insert(custom); - for(CustomSupport customSupport:customSupports){ - String id = UUID.randomUUID().toString(); - customSupport.setId(id); - customSupport.setCreateDate(LocalDateTime.now()); - customSupport.setModifyDate(LocalDateTime.now()); - customSupport.setCustomId(uuid); - customSupportMapper.insert(customSupport); + if(customSupports.size()>0){ + for(CustomSupport customSupport:customSupports){ + String id = UUID.randomUUID().toString(); + customSupport.setId(id); + customSupport.setCreateDate(LocalDateTime.now()); + customSupport.setModifyDate(LocalDateTime.now()); + customSupport.setCustomId(uuid); + customSupportMapper.insert(customSupport); + } } } diff --git a/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java b/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java index e41b603..15957d2 100644 --- a/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java +++ b/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java @@ -11,6 +11,7 @@ import com.gszc.mapper.InvoiceMapper; import com.gszc.service.IInvoiceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.ArrayList; @@ -26,6 +27,7 @@ import java.util.UUID; * @since 2020-04-27 */ @Service +@Transactional public class InvoiceServiceImpl extends ServiceImpl implements IInvoiceService { @Autowired