|
@@ -302,9 +302,11 @@ public class Order extends Controller {
|
|
|
// return getErrReturnObject().setErrMsg("请添加同一领域的商品").toString();
|
|
|
// }
|
|
|
if (sa_promotionid > 0) {
|
|
|
- Rows rows = dbConnect.runSqlQuery("SELECT * from sa_promotion WHERE sa_promotionid=" + sa_promotionid + " and siteid='" + siteid + "'");
|
|
|
+ Rows rows = dbConnect.runSqlQuery("SELECT ifnull(tradefield,'[]') tradefield from sa_promotion WHERE sa_promotionid=" + sa_promotionid + " and siteid='" + siteid + "'");
|
|
|
if (rows.isNotEmpty()) {
|
|
|
- tradefield = rows.get(0).getString("tradefield");
|
|
|
+ String tradefields = rows.get(0).getString("tradefield");
|
|
|
+ JSONArray jsonArray = JSONArray.parseArray(tradefields);
|
|
|
+ tradefield = StringUtils.join(jsonArray, ",");
|
|
|
}
|
|
|
}
|
|
|
|