| @@ -117,6 +117,7 @@ public class WxCouponChannelController extends BaseController { | |||||
| wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); | wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); | ||||
| wxCouponChannel.setCouponStatus(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode()); | wxCouponChannel.setCouponStatus(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode()); | ||||
| wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC, BaseEntity.SortField.Id_DESC); | wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC, BaseEntity.SortField.Id_DESC); | ||||
| wxCouponChannel.setShowBeginTime(new Date()); | |||||
| return wxCouponChannelService.change(wxCouponChannel); | return wxCouponChannelService.change(wxCouponChannel); | ||||
| } | } | ||||
| @@ -159,15 +159,15 @@ public class WxProjectConfigServiceImpl implements WxProjectConfigService { | |||||
| @Override | @Override | ||||
| @Transactional | @Transactional | ||||
| public void initBuilding(List<WxMallBuilding> wxMallBuildings) { | public void initBuilding(List<WxMallBuilding> wxMallBuildings) { | ||||
| wxMallBuildingService.deleteByTenantId(wxMallBuildings.get(0).getTenantId()); | |||||
| wxMallFloorService.deleteByTenantId(wxMallBuildings.get(0).getTenantId()); | |||||
| for (WxMallBuilding wxMallBuilding:wxMallBuildings) { | for (WxMallBuilding wxMallBuilding:wxMallBuildings) { | ||||
| wxMallBuildingService.deleteByTenantId(wxMallBuilding.getTenantId()); | |||||
| wxMallBuilding.setId(null); | wxMallBuilding.setId(null); | ||||
| wxMallBuilding.setMallId(Long.parseLong(wxMallBuilding.getTenantId())); | wxMallBuilding.setMallId(Long.parseLong(wxMallBuilding.getTenantId())); | ||||
| if(wxMallBuilding.getFloors() != null && wxMallBuilding.getFloors().size() > 0){ | if(wxMallBuilding.getFloors() != null && wxMallBuilding.getFloors().size() > 0){ | ||||
| wxMallBuilding.setFloorNumber(wxMallBuilding.getFloors().size()); | wxMallBuilding.setFloorNumber(wxMallBuilding.getFloors().size()); | ||||
| wxMallBuildingService.saveOrUpdate(wxMallBuilding); | wxMallBuildingService.saveOrUpdate(wxMallBuilding); | ||||
| for (WxMallFloor wxMallFloor:wxMallBuilding.getFloors()) { | for (WxMallFloor wxMallFloor:wxMallBuilding.getFloors()) { | ||||
| wxMallFloorService.deleteByTenantId(wxMallBuilding.getTenantId()); | |||||
| wxMallFloor.setId(null); | wxMallFloor.setId(null); | ||||
| wxMallFloor.setTenantId(wxMallBuilding.getTenantId()); | wxMallFloor.setTenantId(wxMallBuilding.getTenantId()); | ||||
| wxMallFloor.setParentTenantId(wxMallBuilding.getParentTenantId()); | wxMallFloor.setParentTenantId(wxMallBuilding.getParentTenantId()); | ||||
| @@ -748,7 +748,7 @@ | |||||
| cu.phone,m2.name as verify_merchant_name,cal.channel_type | cu.phone,m2.name as verify_merchant_name,cal.channel_type | ||||
| --> | --> | ||||
| co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status, | |||||
| co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,co.order_id, | |||||
| co.create_date,co.update_date,co.coupon_price, co.verify_type, co.pay_vendor,c.title,c.sale_price,c.use_price,c.price, | co.create_date,co.update_date,co.coupon_price, co.verify_type, co.pay_vendor,c.title,c.sale_price,c.use_price,c.price, | ||||
| c.unit,c.auto_refund,c.business,c.subsidy_type,c.source_type,ms.subsidy subsidy_num, | c.unit,c.auto_refund,c.business,c.subsidy_type,c.source_type,ms.subsidy subsidy_num, | ||||
| (CASE WHEN couc.mc = 1 THEN m1.name ELSE '[多商户通用]' END) AS merchant_name, | (CASE WHEN couc.mc = 1 THEN m1.name ELSE '[多商户通用]' END) AS merchant_name, | ||||
| @@ -780,7 +780,7 @@ | |||||
| </if> | </if> | ||||
| GROUP BY product_id) couc | GROUP BY product_id) couc | ||||
| RIGHT JOIN ( | RIGHT JOIN ( | ||||
| SELECT co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.c_user_id,co.b_user_id,co.coupon_type, | |||||
| SELECT co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.c_user_id,co.b_user_id,co.order_id,co.coupon_type, | |||||
| co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.auto_refund,co.verify_type,co.pay_vendor | co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.auto_refund,co.verify_type,co.pay_vendor | ||||
| FROM wx_coupon_order co WHERE 1=1 | FROM wx_coupon_order co WHERE 1=1 | ||||
| <if test=" null != tenantId and '' != tenantId"> | <if test=" null != tenantId and '' != tenantId"> | ||||
| @@ -849,6 +849,9 @@ | |||||
| <if test=" null != id "> | <if test=" null != id "> | ||||
| and co.id = #{id} | and co.id = #{id} | ||||
| </if> | </if> | ||||
| <if test=" null != orderId "> | |||||
| and co.order_id = #{orderId} | |||||
| </if> | |||||
| <if test=" null != couponId "> | <if test=" null != couponId "> | ||||
| and c.id = #{couponId} | and c.id = #{couponId} | ||||
| </if> | </if> | ||||