Kaynağa Gözat

fix bug

release_toaliyun_real
lin 3 yıl önce
ebeveyn
işleme
db3ea4d139
4 değiştirilmiş dosya ile 13 ekleme ve 1 silme
  1. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java
  3. +6
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java
  4. +4
    -0
      mallinkService/src/main/resources/mapper/WxCouponMapper.xml

+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java Dosyayı Görüntüle

@@ -636,6 +636,7 @@ public class WxCouponController extends BaseController {
} }
} }
@TenantIgnore
@ApiOperation("商场设置平台券商户") @ApiOperation("商场设置平台券商户")
@PostMapping("/setParentCouponMerchants") @PostMapping("/setParentCouponMerchants")
public ResultData setMallMerchants(@RequestBody WxCoupon wxCoupon) { public ResultData setMallMerchants(@RequestBody WxCoupon wxCoupon) {


+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java Dosyayı Görüntüle

@@ -125,4 +125,6 @@ public interface WxCouponMapper extends CommonMapper<WxCoupon, Long> {
List<TtCouponVo> ttCouponList(TtCouponVo ttCouponVo); List<TtCouponVo> ttCouponList(TtCouponVo ttCouponVo);


Integer findCategoryIdById(@Param("id")Long id,@Param("tenantId")String tenantId); Integer findCategoryIdById(@Param("id")Long id,@Param("tenantId")String tenantId);
void setMakeMerchantId(WxCoupon couponQ);
} }

+ 6
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java Dosyayı Görüntüle

@@ -811,7 +811,7 @@ public class WxCouponServiceImpl implements WxCouponService {
WxMerchant makeMerchant = null; WxMerchant makeMerchant = null;
//平台券,集团商管商户 //平台券,集团商管商户
if (EnumCouponType.COUPON_DOUYIN_PLAT.getCode() == coupon.getType()) { if (EnumCouponType.COUPON_DOUYIN_PLAT.getCode() == coupon.getType()) {
//TODO 查询集团商管商户
//查询集团商管商户
makeMerchant = wxMerchantService.findAdmin(coupon); makeMerchant = wxMerchantService.findAdmin(coupon);
//品牌券,查询集团品牌商户 //品牌券,查询集团品牌商户
}else if (EnumCouponType.COUPON_DOUYIN_BRAND.getCode() == coupon.getType()) { }else if (EnumCouponType.COUPON_DOUYIN_BRAND.getCode() == coupon.getType()) {
@@ -1530,6 +1530,7 @@ public class WxCouponServiceImpl implements WxCouponService {
if (null == wxCoupon.getMerchantIds()) { if (null == wxCoupon.getMerchantIds()) {
throw new MallinkException(Result.ERROR,"请选择商户"); throw new MallinkException(Result.ERROR,"请选择商户");
} }
Long makeMerchantId = coupon.getMakeMerchantId();
// //
StringBuffer merchantParams = new StringBuffer("{\"tenantId\":").append(mallTenantEntity.getTenantId()).append(",\"mallMerchantParams\":").append("["); StringBuffer merchantParams = new StringBuffer("{\"tenantId\":").append(mallTenantEntity.getTenantId()).append(",\"mallMerchantParams\":").append("[");
Long[] mids = wxCoupon.getMerchantIds(); Long[] mids = wxCoupon.getMerchantIds();
@@ -1544,6 +1545,10 @@ public class WxCouponServiceImpl implements WxCouponService {
checkCouponMerchantReceiver(coupon,true); checkCouponMerchantReceiver(coupon,true);
final IdWorker idWorker = IdWorker.get(); final IdWorker idWorker = IdWorker.get();
updateCouponMerchants(coupon,idWorker); updateCouponMerchants(coupon,idWorker);
//平台券设置商管商户
if (null == makeMerchantId) {
wxCouponMapper.setMakeMerchantId(coupon);
}
}catch(Exception e) { }catch(Exception e) {
throw e; throw e;
} }


+ 4
- 0
mallinkService/src/main/resources/mapper/WxCouponMapper.xml Dosyayı Görüntüle

@@ -1494,5 +1494,9 @@
where id = #{id} where id = #{id}
and tenant_id = #{tenantId} and tenant_id = #{tenantId}
</select> </select>
<update id="setMakeMerchantId" parameterType="com.iformall.domain.po.WxCoupon" >
update wx_coupon set make_merchant_id = #{makeMerchantId} where id = #{id} and tenant_id = #{tenantId}
</update>


</mapper> </mapper>

Yükleniyor…
İptal
Kaydet