合并代码

Pu Zhibing

4 天以前 8522e469e00e1cf6c0410165b0f76c806c13ca83

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantActivityGiveController.java

@@ -17,7 +17,7 @@
import com.stylefeng.guns.modular.system.response.MerchantActivityVo;
import com.stylefeng.guns.modular.system.response.UserRequest;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.OrderUtil;
import com.stylefeng.guns.modular.system.util.OrderUtils;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -280,7 +280,7 @@
                    UserMerchantCoupon userMerchantCoupon = new UserMerchantCoupon();
                    userMerchantCoupon.setUserId(two.getUserId());
                    userMerchantCoupon.setUserType(two.getType());
                    userMerchantCoupon.setCode(OrderUtil.getRandomCode(16));
                    userMerchantCoupon.setCode(OrderUtils.getRandomCode(16));
                    userMerchantCoupon.setMerchantActivityId(merchantActivity.getId());
                    userMerchantCoupon.setMerchantCouponId(activitySlave.getMerchantCouponId());
                    userMerchantCoupon.setStatus(1);