|
|
@@ -194,7 +194,7 @@ public class CmsOrderController {
|
|
|
builder.put("tb", String.format(" inner join user_benefits_order_record ubor on ubor.order_id = o.id and ubor.type = 'RENEW'"));
|
|
|
}
|
|
|
if (otherOrderType == 6) {
|
|
|
- //5.加盟订单
|
|
|
+ //6.加盟订单
|
|
|
builder.put("tb", String.format(" inner join user_mirror_shop_order_relate umr on umr.order_id = o.id"));
|
|
|
}
|
|
|
}
|
|
|
@@ -390,7 +390,7 @@ public class CmsOrderController {
|
|
|
builder.put("tb", String.format(" inner join user_benefits_order_record ubor on ubor.order_id = o.id and ubor.type = 'RENEW'"));
|
|
|
}
|
|
|
if (otherOrderType == 6) {
|
|
|
- //5.加盟订单
|
|
|
+ //6.加盟订单
|
|
|
builder.put("tb", String.format(" inner join user_mirror_shop_order_relate umr on umr.order_id = o.id"));
|
|
|
}
|
|
|
}
|