|
|
@@ -17,6 +17,7 @@ import com.caimei365.order.model.po.UserVipPo;
|
|
|
import com.caimei365.order.model.vo.DiscernReceiptVo;
|
|
|
import com.caimei365.order.model.vo.OrderPayLinkVo;
|
|
|
import com.caimei365.order.service.PayNonOrderService;
|
|
|
+import com.caimei365.order.utils.CodeUtil;
|
|
|
import com.caimei365.order.utils.MathUtil;
|
|
|
import com.caimei365.order.utils.PayUtil;
|
|
|
import com.caimei365.order.utils.pay.RSAUtil;
|
|
|
@@ -656,7 +657,8 @@ public class PayNonOrderServiceImpl implements PayNonOrderService {
|
|
|
long time = System.currentTimeMillis() / 1000;
|
|
|
json.put("time", time);
|
|
|
//商户退款流水号，由商户自行生成，必须唯一
|
|
|
- String merchantRefundNo = payVipDto.getCode() + payVipDto.getVipRecordId() + "##" + discernReceipt.getId();
|
|
|
+ String randomLetter = CodeUtil.randomLetter(6);
|
|
|
+ String merchantRefundNo = payVipDto.getVipRecordId() + payVipDto.getCode() + randomLetter + "##" + discernReceipt.getId();
|
|
|
json.put("merchantRefundNo", merchantRefundNo);
|
|
|
//退款金额，单位分，必须大于0
|
|
|
double refundAmt = MathUtil.mul(discernReceipt.getAssociateAmount(), 100).doubleValue();
|
chao