|
@@ -410,7 +410,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
}
|
|
}
|
|
|
String gcDetail;
|
|
String gcDetail;
|
|
|
if (data.getGcType() == 1) {
|
|
if (data.getGcType() == 1) {
|
|
|
- gcDetail = String.format("%s张现金卡%s%s", num, data.getCash().divide(BigDecimal.valueOf(100)), Constant.CN_CYS);
|
|
|
|
|
|
|
+ gcDetail = String.format("%s张现金卡%s%s", num, Constant.CN_CYS, data.getCash().divide(BigDecimal.valueOf(100)));
|
|
|
payTitle.append(gcDetail);
|
|
payTitle.append(gcDetail);
|
|
|
} else {
|
|
} else {
|
|
|
gcDetail = String.format("%s张虚拟卡%s%s", num, data.getGcGoodsTitle(), data.getGcSpecVal());
|
|
gcDetail = String.format("%s张虚拟卡%s%s", num, data.getGcGoodsTitle(), data.getGcSpecVal());
|
|
@@ -2183,7 +2183,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
GiftCardUserRecord giftCardUserRecord = new GiftCardUserRecord();
|
|
GiftCardUserRecord giftCardUserRecord = new GiftCardUserRecord();
|
|
|
String gcDetail;
|
|
String gcDetail;
|
|
|
if (data.getGcType() == 1) {
|
|
if (data.getGcType() == 1) {
|
|
|
- gcDetail = String.format("现金卡%s%s", data.getCash().divide(BigDecimal.valueOf(100)), Constant.CN_CYS);
|
|
|
|
|
|
|
+ gcDetail = String.format("现金卡%s%s", Constant.CN_CYS, data.getCash().divide(BigDecimal.valueOf(100)));
|
|
|
giftCardUserRecord.setCash(data.getCash());
|
|
giftCardUserRecord.setCash(data.getCash());
|
|
|
giftCardUserRecord.setRemainCash(data.getCash());
|
|
giftCardUserRecord.setRemainCash(data.getCash());
|
|
|
} else {
|
|
} else {
|