diff --git a/common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/pay/tm/vo/TmTradeInfo.java b/common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/pay/tm/vo/TmTradeInfo.java index aa7d822..b7cb413 100644 --- a/common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/pay/tm/vo/TmTradeInfo.java +++ b/common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/pay/tm/vo/TmTradeInfo.java @@ -9,7 +9,7 @@ public class TmTradeInfo { /** * 太米系统流水Id */ - private Integer id; + private String id; /** * 第三方内部流水号 diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/suit/service/impl/SuitConverterImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/suit/service/impl/SuitConverterImpl.java index 3872f83..f781fec 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/suit/service/impl/SuitConverterImpl.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/suit/service/impl/SuitConverterImpl.java @@ -15,7 +15,6 @@ public class SuitConverterImpl implements SuitConverter { } Suit po = new Suit(); // 设置基本信息 - po.setUserId(data.getUserId()); po.setStoreId(data.getStoreId()); po.setOrderNum(data.getOrderNum()); po.setLightingNums(data.getLightingNums()); diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/suit/service/impl/SuitServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/suit/service/impl/SuitServiceImpl.java index 741a501..720573c 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/suit/service/impl/SuitServiceImpl.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/suit/service/impl/SuitServiceImpl.java @@ -6,6 +6,7 @@ import com.github.pagehelper.PageHelper; import com.ruoyi.bst.store.domain.StoreQuery; import com.ruoyi.bst.store.domain.StoreVO; import com.ruoyi.bst.store.service.StoreService; +import com.ruoyi.bst.storeStaff.domain.StoreStaff; import com.ruoyi.bst.storeStaff.domain.enums.StoreStaffPermission; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.ServiceUtil; @@ -65,6 +66,8 @@ public class SuitServiceImpl implements SuitService @Override public int insertSuit(Suit suit) { + storeService.selectStoreById(suit.getStoreId()); + suit.setUserId(suit.getUserId()); suit.setCreateTime(DateUtils.getNowDate()); return suitMapper.insertSuit(suit); } diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/bst/SuitController.java b/ruoyi-web/src/main/java/com/ruoyi/web/bst/SuitController.java index 2373bd3..5495c06 100644 --- a/ruoyi-web/src/main/java/com/ruoyi/web/bst/SuitController.java +++ b/ruoyi-web/src/main/java/com/ruoyi/web/bst/SuitController.java @@ -98,7 +98,6 @@ public class SuitController extends BaseController if (!userValidator.canView(suit.getUserId())) { suit.setUserId(getUserId()); } - suit.setUserId(getUserId()); suitConverter.toPoByCreate(suit); return toAjax(suitService.insertSuit(suit)); }