新增套餐bug修正,太米微信类型转换修正
This commit is contained in:
parent
47e879bd19
commit
233d0ccaef
|
@ -9,7 +9,7 @@ public class TmTradeInfo {
|
||||||
/**
|
/**
|
||||||
* 太米系统流水Id
|
* 太米系统流水Id
|
||||||
*/
|
*/
|
||||||
private Integer id;
|
private String id;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 第三方内部流水号
|
* 第三方内部流水号
|
||||||
|
|
|
@ -15,7 +15,6 @@ public class SuitConverterImpl implements SuitConverter {
|
||||||
}
|
}
|
||||||
Suit po = new Suit();
|
Suit po = new Suit();
|
||||||
// 设置基本信息
|
// 设置基本信息
|
||||||
po.setUserId(data.getUserId());
|
|
||||||
po.setStoreId(data.getStoreId());
|
po.setStoreId(data.getStoreId());
|
||||||
po.setOrderNum(data.getOrderNum());
|
po.setOrderNum(data.getOrderNum());
|
||||||
po.setLightingNums(data.getLightingNums());
|
po.setLightingNums(data.getLightingNums());
|
||||||
|
|
|
@ -6,6 +6,7 @@ import com.github.pagehelper.PageHelper;
|
||||||
import com.ruoyi.bst.store.domain.StoreQuery;
|
import com.ruoyi.bst.store.domain.StoreQuery;
|
||||||
import com.ruoyi.bst.store.domain.StoreVO;
|
import com.ruoyi.bst.store.domain.StoreVO;
|
||||||
import com.ruoyi.bst.store.service.StoreService;
|
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.bst.storeStaff.domain.enums.StoreStaffPermission;
|
||||||
import com.ruoyi.common.utils.DateUtils;
|
import com.ruoyi.common.utils.DateUtils;
|
||||||
import com.ruoyi.common.utils.ServiceUtil;
|
import com.ruoyi.common.utils.ServiceUtil;
|
||||||
|
@ -65,6 +66,8 @@ public class SuitServiceImpl implements SuitService
|
||||||
@Override
|
@Override
|
||||||
public int insertSuit(Suit suit)
|
public int insertSuit(Suit suit)
|
||||||
{
|
{
|
||||||
|
storeService.selectStoreById(suit.getStoreId());
|
||||||
|
suit.setUserId(suit.getUserId());
|
||||||
suit.setCreateTime(DateUtils.getNowDate());
|
suit.setCreateTime(DateUtils.getNowDate());
|
||||||
return suitMapper.insertSuit(suit);
|
return suitMapper.insertSuit(suit);
|
||||||
}
|
}
|
||||||
|
|
|
@ -98,7 +98,6 @@ public class SuitController extends BaseController
|
||||||
if (!userValidator.canView(suit.getUserId())) {
|
if (!userValidator.canView(suit.getUserId())) {
|
||||||
suit.setUserId(getUserId());
|
suit.setUserId(getUserId());
|
||||||
}
|
}
|
||||||
suit.setUserId(getUserId());
|
|
||||||
suitConverter.toPoByCreate(suit);
|
suitConverter.toPoByCreate(suit);
|
||||||
return toAjax(suitService.insertSuit(suit));
|
return toAjax(suitService.insertSuit(suit));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user