Просмотр исходного кода

Merge branch 'release_real_200809' of https://git.malls.iformall.com/server/formallProject into release_real_200809

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
0a4ff16ba4
3 измененных файлов: 8 добавлений и 4 удалений
  1. +1
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java
  3. +5
    -2
      mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml

+ 1
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java Просмотреть файл

@@ -117,6 +117,7 @@ public class WxCouponChannelController extends BaseController {
wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode());
wxCouponChannel.setCouponStatus(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode());
wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC, BaseEntity.SortField.Id_DESC);
wxCouponChannel.setShowBeginTime(new Date());
return wxCouponChannelService.change(wxCouponChannel);
}



+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java Просмотреть файл

@@ -159,15 +159,15 @@ public class WxProjectConfigServiceImpl implements WxProjectConfigService {
@Override
@Transactional
public void initBuilding(List<WxMallBuilding> wxMallBuildings) {
wxMallBuildingService.deleteByTenantId(wxMallBuildings.get(0).getTenantId());
wxMallFloorService.deleteByTenantId(wxMallBuildings.get(0).getTenantId());
for (WxMallBuilding wxMallBuilding:wxMallBuildings) {
wxMallBuildingService.deleteByTenantId(wxMallBuilding.getTenantId());
wxMallBuilding.setId(null);
wxMallBuilding.setMallId(Long.parseLong(wxMallBuilding.getTenantId()));
if(wxMallBuilding.getFloors() != null && wxMallBuilding.getFloors().size() > 0){
wxMallBuilding.setFloorNumber(wxMallBuilding.getFloors().size());
wxMallBuildingService.saveOrUpdate(wxMallBuilding);
for (WxMallFloor wxMallFloor:wxMallBuilding.getFloors()) {
wxMallFloorService.deleteByTenantId(wxMallBuilding.getTenantId());
wxMallFloor.setId(null);
wxMallFloor.setTenantId(wxMallBuilding.getTenantId());
wxMallFloor.setParentTenantId(wxMallBuilding.getParentTenantId());


+ 5
- 2
mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml Просмотреть файл

@@ -748,7 +748,7 @@
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,
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,
@@ -780,7 +780,7 @@
</if>
GROUP BY product_id) couc
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
FROM wx_coupon_order co WHERE 1=1
<if test=" null != tenantId and '' != tenantId">
@@ -849,6 +849,9 @@
<if test=" null != id ">
and co.id = #{id}
</if>
<if test=" null != orderId ">
and co.order_id = #{orderId}
</if>
<if test=" null != couponId ">
and c.id = #{couponId}
</if>


Загрузка…
Отмена
Сохранить