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

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

release_toaliyun_real
lin 3 лет назад
Родитель
Сommit
f3e7ce0b37
3 измененных файлов: 5 добавлений и 5 удалений
  1. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java
  2. +2
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxCouponMerchantMapper.java
  3. +2
    -4
      mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml

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

@@ -307,6 +307,7 @@ public class WxCouponController extends BaseController {
* @param wxCoupon * @param wxCoupon
* @return * @return
*/ */
// @TenantIgnore
@ApiOperation("商场批量设置商户") @ApiOperation("商场批量设置商户")
@PostMapping("/setManyCouponMerchants") @PostMapping("/setManyCouponMerchants")
public ResultData setManyCouponMerchants(@RequestBody WxCoupon wxCoupon) { public ResultData setManyCouponMerchants(@RequestBody WxCoupon wxCoupon) {


+ 2
- 1
mallinkService/src/main/java/com/iformall/mapper/WxCouponMerchantMapper.java Просмотреть файл

@@ -28,5 +28,6 @@ public interface WxCouponMerchantMapper extends CommonMapper<WxCouponMerchant, L


int updateStatus(@Param("tenantId")String tenantId, @Param("productId")Long couponId, @Param("merchantIdList")List<Long> merchantIds,@Param("status")Integer status); int updateStatus(@Param("tenantId")String tenantId, @Param("productId")Long couponId, @Param("merchantIdList")List<Long> merchantIds,@Param("status")Integer status);


int insertList(List<WxCouponMerchant> addList);
//自动加tenent
int insertList(@Param("addList")List<WxCouponMerchant> addList);
} }

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

@@ -207,12 +207,10 @@


<insert id="insertList" parameterType="java.util.List"> <insert id="insertList" parameterType="java.util.List">
insert into wx_coupon_merchant insert into wx_coupon_merchant
(`id`,`tenant_id`,`parent_tenant_id`,`product_id`,`merchant_id`,`parameter`,`create_date`,`update_date`,`status`)
(`id`,`product_id`,`merchant_id`,`parameter`,`create_date`,`update_date`,`status`)
values values
<foreach collection="list" item="item" index="index" separator=",">
<foreach collection="addList" item="item" index="index" separator=",">
(#{item.id,jdbcType=BIGINT}, (#{item.id,jdbcType=BIGINT},
#{item.tenantId,jdbcType=VARCHAR},
#{item.parentTenantId,jdbcType=VARCHAR},
#{item.productId,jdbcType=BIGINT}, #{item.productId,jdbcType=BIGINT},
#{item.merchantId,jdbcType=BIGINT}, #{item.merchantId,jdbcType=BIGINT},
#{item.parameter,jdbcType=VARCHAR}, #{item.parameter,jdbcType=VARCHAR},


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