czg_team/wx-cashier-service
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 霸王餐充值订单id未保存修复

Browse Source
This commit is contained in:
SongZhang
2024-10-28 09:41:33 +08:00
parent 05a7470c6f
commit 4fd3407f7a
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
View File

@@ -19,10 +19,7 @@ import com.chaozhanggui.system.cashierservice.entity.dto.ShopEatTypeInfoDTO;
import com.chaozhanggui.system.cashierservice.entity.vo.ShopUserListVo; import com.chaozhanggui.system.cashierservice.entity.vo.ShopUserListVo;
import com.chaozhanggui.system.cashierservice.entity.vo.TbUserCouponVo; import com.chaozhanggui.system.cashierservice.entity.vo.TbUserCouponVo;
import com.chaozhanggui.system.cashierservice.exception.MsgException; import com.chaozhanggui.system.cashierservice.exception.MsgException;
import com.chaozhanggui.system.cashierservice.mapper.MpCashierCartMapper; import com.chaozhanggui.system.cashierservice.mapper.*;
import com.chaozhanggui.system.cashierservice.mapper.MpOrderDetailMapper;
import com.chaozhanggui.system.cashierservice.mapper.MpOrderInfoMapper;
import com.chaozhanggui.system.cashierservice.mapper.MpShopCouponMapper;
import com.chaozhanggui.system.cashierservice.model.PayReq; import com.chaozhanggui.system.cashierservice.model.PayReq;
import com.chaozhanggui.system.cashierservice.model.TradeQueryReq; import com.chaozhanggui.system.cashierservice.model.TradeQueryReq;
import com.chaozhanggui.system.cashierservice.mpservice.MpShopTableService; import com.chaozhanggui.system.cashierservice.mpservice.MpShopTableService;
@@ -192,6 +189,7 @@ public class PayService {
private final MpShopTableService mpShopTableService; private final MpShopTableService mpShopTableService;
private final TbFreeDineConfigService freeDineConfigService; private final TbFreeDineConfigService freeDineConfigService;
private final TbShopCouponService shopCouponService; private final TbShopCouponService shopCouponService;
private final MpMemberInMapper mpMemberInMapper;
@Qualifier("tbShopCouponService") @Qualifier("tbShopCouponService")
@Autowired @Autowired
private TbShopCouponService tbShopCouponService; private TbShopCouponService tbShopCouponService;
@@ -200,11 +198,12 @@ public class PayService {
@Autowired @Autowired
private MpShopCouponMapper mpShopCouponMapper; private MpShopCouponMapper mpShopCouponMapper;
public PayService(@Qualifier("tbShopSongOrderServiceImpl") TbShopSongOrderService shopSongOrderService, MpShopTableService mpShopTableService, TbFreeDineConfigService freeDineConfigService, TbShopCouponService shopCouponService) { public PayService(@Qualifier("tbShopSongOrderServiceImpl") TbShopSongOrderService shopSongOrderService, MpShopTableService mpShopTableService, TbFreeDineConfigService freeDineConfigService, TbShopCouponService shopCouponService, MpMemberInMapper mpMemberInMapper) {
this.shopSongOrderService = shopSongOrderService; this.shopSongOrderService = shopSongOrderService;
this.mpShopTableService = mpShopTableService; this.mpShopTableService = mpShopTableService;
this.freeDineConfigService = freeDineConfigService; this.freeDineConfigService = freeDineConfigService;
this.shopCouponService = shopCouponService; this.shopCouponService = shopCouponService;
this.mpMemberInMapper = mpMemberInMapper;
} }
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@@ -1046,7 +1045,7 @@ public class PayService {
memberIn.setMerchantId(Integer.valueOf(shopInfo.getMerchantId())); memberIn.setMerchantId(Integer.valueOf(shopInfo.getMerchantId()));
memberIn.setCreateTime(new Date()); memberIn.setCreateTime(new Date());
memberIn.setOrderId(memberInDTO.getOrderId()); memberIn.setOrderId(memberInDTO.getOrderId());
tbMemberInMapper.insert(memberIn); mpMemberInMapper.insert(memberIn);
if ("ysk".equals(thirdPayType)) { if ("ysk".equals(thirdPayType)) {

2
src/main/resources/mapper/TbActivateMapper.xml
View File

@@ -40,7 +40,7 @@
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from tb_activate from tb_activate
where shop_id = #{shop_id} where shop_id = #{shopId}
and amount = #{amount} and amount = #{amount}
order by id desc order by id desc
limit 1 limit 1