Selaa lähdekoodia

feat: 积分包结算管理-发票上传2

lixuesong 1 vuosi sitten
vanhempi
commit
6986a6994e

+ 27 - 0
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScorePackageController.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONObject;
@@ -26,6 +27,7 @@ import com.qunzhixinxi.hnqz.admin.api.enums.TargetType;
 import com.qunzhixinxi.hnqz.admin.api.vo.WmScorePackageVO;
 import com.qunzhixinxi.hnqz.admin.api.vo.WmScorePackageVO;
 import com.qunzhixinxi.hnqz.admin.entity.*;
 import com.qunzhixinxi.hnqz.admin.entity.*;
 import com.qunzhixinxi.hnqz.admin.entity.dto.UnpackDTO;
 import com.qunzhixinxi.hnqz.admin.entity.dto.UnpackDTO;
+import com.qunzhixinxi.hnqz.admin.entity.input.WmScorePackageSettleOutput;
 import com.qunzhixinxi.hnqz.admin.entity.model.excel.BatchPackageExcelModel;
 import com.qunzhixinxi.hnqz.admin.entity.model.excel.BatchPackageExcelModel;
 import com.qunzhixinxi.hnqz.admin.enums.DelEnum;
 import com.qunzhixinxi.hnqz.admin.enums.DelEnum;
 import com.qunzhixinxi.hnqz.admin.enums.EnableEnum;
 import com.qunzhixinxi.hnqz.admin.enums.EnableEnum;
@@ -3272,4 +3274,29 @@ public class WmScorePackageController {
 		return R.ok(unpack);
 		return R.ok(unpack);
 	}
 	}
 
 
+
+	/**
+	 * 积分包结算管理-发票上传
+	 *
+	 * @param param 发票参数
+	 * @return {@link R}<{@link ?}> 结果
+	 */
+	@SysLog("积分包结算管理-发票上传")
+	@PostMapping("/upload-invoice")
+	public R<?> uploadInvoice(@RequestBody WmScorePackageSettleOutput param) {
+		log.info("积分包结算管理-发票上传参数:{}", param);
+		if (StrUtil.isBlank(param.getId()) || StrUtil.isBlank(param.getInvoiceNumber()) || ArrayUtil.isEmpty(param.getInvoiceFile())) {
+			return R.failed("必填参数为空");
+		}
+
+		WmScorePackage update = new WmScorePackage();
+		update.setId(param.getId());
+		update.setInvoiceNumber(param.getInvoiceNumber());
+		update.setInvoiceFile(param.getInvoiceFile());
+		update.setUpdateTime(LocalDateTime.now());
+		update.setUpdateUser(SecurityUtils.getUser().getId());
+
+		return R.ok(this.updateById(update));
+	}
+
 }
 }

+ 0 - 27
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageServiceImpl.java

@@ -51,7 +51,6 @@ import com.qunzhixinxi.hnqz.admin.service.*;
 import com.qunzhixinxi.hnqz.common.core.exception.BizException;
 import com.qunzhixinxi.hnqz.common.core.exception.BizException;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.data.datascope.DataScope;
 import com.qunzhixinxi.hnqz.common.data.datascope.DataScope;
-import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
 import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
 import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
@@ -63,8 +62,6 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.AsyncResult;
 import org.springframework.scheduling.annotation.AsyncResult;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 
 
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDate;
@@ -3374,28 +3371,4 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
 
 		return packages;
 		return packages;
 	}
 	}
-
-	/**
-	 * 积分包结算管理-发票上传
-	 *
-	 * @param param 发票参数
-	 * @return {@link R}<{@link ?}> 结果
-	 */
-	@SysLog("积分包结算管理-发票上传")
-	@PostMapping("/upload-invoice")
-	public R<?> uploadInvoice(@RequestBody WmScorePackageSettleOutput param) {
-		log.info("积分包结算管理-发票上传参数:{}", param);
-		if (StrUtil.isBlank(param.getId()) || StrUtil.isBlank(param.getInvoiceNumber()) || ArrayUtil.isEmpty(param.getInvoiceFile())) {
-			return R.failed("必填参数为空");
-		}
-
-		WmScorePackage update = new WmScorePackage();
-		update.setId(param.getId());
-		update.setInvoiceNumber(param.getInvoiceNumber());
-		update.setInvoiceFile(param.getInvoiceFile());
-		update.setUpdateTime(LocalDateTime.now());
-		update.setUpdateUser(SecurityUtils.getUser().getId());
-
-		return R.ok(this.updateById(update));
-	}
 }
 }