|
@@ -3823,6 +3823,8 @@ public class TOrderController {
|
|
|
String sn = request.getParameter("r2_OrderNo");
|
|
|
//价格
|
|
|
String price = request.getParameter("r3_Amount");
|
|
|
+ // 优惠码
|
|
|
+ String codeNum = request.getParameter("r5_Mp");
|
|
|
Double money = null;
|
|
|
TPrice tPrice = R.getDataIfSuccess(szwlFeign.getPrice("优惠码"));
|
|
|
money = tPrice.getPrice();
|
|
@@ -3880,7 +3882,7 @@ public class TOrderController {
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
String sd = sdf.format(new Date(Long.parseLong(String.valueOf(d))));
|
|
|
Date lastUseDate = new Date(Long.parseLong(String.valueOf(d)));
|
|
|
- szwlFeign.addPromoCode(String.valueOf(order.getAdminId()),lastUseDate,number);
|
|
|
+ szwlFeign.addPromoCode(String.valueOf(order.getAdminId()), lastUseDate, number, codeNum);
|
|
|
|
|
|
return "支付成功";
|
|
|
}
|