|
@@ -18,6 +18,7 @@ import com.ylx.massage.domain.TWxUser;
|
|
|
import com.ylx.massage.service.TJsService;
|
|
import com.ylx.massage.service.TJsService;
|
|
|
import com.ylx.massage.service.TWxUserService;
|
|
import com.ylx.massage.service.TWxUserService;
|
|
|
import com.ylx.shopingfundsdetail.domain.vo.ShoppingFundsDetailAddDto;
|
|
import com.ylx.shopingfundsdetail.domain.vo.ShoppingFundsDetailAddDto;
|
|
|
|
|
+import com.ylx.shopingfundsdetail.enums.ShoppingFundsExpenseTypeEnum;
|
|
|
import com.ylx.shopingfundsdetail.service.ShoppingFundsDetailService;
|
|
import com.ylx.shopingfundsdetail.service.ShoppingFundsDetailService;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
@@ -37,8 +38,6 @@ public class GiftCardOrderServiceImpl extends ServiceImpl<GiftCardOrderMapper, G
|
|
|
private TWxUserService wxUserService;
|
|
private TWxUserService wxUserService;
|
|
|
@Resource
|
|
@Resource
|
|
|
private ShoppingFundsDetailService shoppingFundsDetailService;
|
|
private ShoppingFundsDetailService shoppingFundsDetailService;
|
|
|
- // 充值
|
|
|
|
|
- public static final int EXPENSE_TYPE_RECHARGE = 0;
|
|
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@@ -133,7 +132,7 @@ public class GiftCardOrderServiceImpl extends ServiceImpl<GiftCardOrderMapper, G
|
|
|
dto.setUserId(wxUser.getId());
|
|
dto.setUserId(wxUser.getId());
|
|
|
dto.setAmount(payAmount);
|
|
dto.setAmount(payAmount);
|
|
|
dto.setOrderNo(result.getOutTradeNo());
|
|
dto.setOrderNo(result.getOutTradeNo());
|
|
|
- dto.setExpenseType(EXPENSE_TYPE_RECHARGE);
|
|
|
|
|
|
|
+ dto.setExpenseType(ShoppingFundsExpenseTypeEnum.RECHARGE.getCode());
|
|
|
dto.setBalance(newBalance);
|
|
dto.setBalance(newBalance);
|
|
|
dto.setGiftCardId(cardOrder.getGiftCardId());
|
|
dto.setGiftCardId(cardOrder.getGiftCardId());
|
|
|
shoppingFundsDetailService.addShoppingFundsDetail(dto);
|
|
shoppingFundsDetailService.addShoppingFundsDetail(dto);
|