Merge branch 'dsc' into 'develop'

Dsc

See merge request 8timerv2/8timerapiv200!68

src/main/java/cn/timer/api/controller/qyzx/QyzxBusinessController.java

@@ -32,6 +32,7 @@ import com.github.pagehelper.PageHelper;
 
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
@@ -111,7 +112,7 @@ public class QyzxBusinessController {
 		QyzxEntInfoM qyzxEntInfoM = QyzxEntInfoM.builder().build()
 				.selectOne(new LambdaQueryWrapper<QyzxEntInfoM>().eq(QyzxEntInfoM::getId, userBean.getOrgCode()));
 		Date endTime = qyzxEntInfoM.getEndTime();
-		Long day = DateUtil.between(new Date(), endTime, DateUnit.DAY,false);
+		Long day = DateUtil.between(new Date(), endTime, DateUnit.DAY, false);
 		Integer level = qyzxEntInfoM.getLevel();
 
 		Map<String, Object> map1 = new HashMap<String, Object>();
@@ -151,13 +152,22 @@ public class QyzxBusinessController {
 
 	@GetMapping(value = "/getPayList/System")
 	@ApiOperation(value = "获取系统续费商品列表", httpMethod = "GET", notes = "接口发布说明")
-	public Result<List<QyzxPayContent>> getPayListWithSystem(@CurrentUser UserBean userBean) {
-		List<QyzxPayContent> list = QyzxPayContent.builder().build()
-				.selectList(new LambdaQueryWrapper<QyzxPayContent>().eq(QyzxPayContent::getPmid, 3).select(
-						QyzxPayContent::getId, QyzxPayContent::getContent, QyzxPayContent::getNowPrice,
-						QyzxPayContent::getOriginalPrice, QyzxPayContent::getSpecification,
-						QyzxPayContent::getExpiration));
-		return ResultUtil.data(list, "获取成功");
+	public Result<Map<String, Object>> getPayListWithSystem(@CurrentUser UserBean userBean) {
+		List<QyzxPayContent> list1 = QyzxPayContent.builder().build()
+				.selectList(new LambdaQueryWrapper<QyzxPayContent>().eq(QyzxPayContent::getPmid, 3)
+						.eq(QyzxPayContent::getSpecification, 1).select(QyzxPayContent::getId,
+								QyzxPayContent::getNowPrice, QyzxPayContent::getOriginalPrice,
+								QyzxPayContent::getExpiration));
+		List<QyzxPayContent> list2 = QyzxPayContent.builder().build()
+				.selectList(new LambdaQueryWrapper<QyzxPayContent>().eq(QyzxPayContent::getPmid, 3)
+						.eq(QyzxPayContent::getSpecification, 2).select(QyzxPayContent::getId,
+								QyzxPayContent::getNowPrice, QyzxPayContent::getOriginalPrice,
+								QyzxPayContent::getExpiration));
+
+		Map<String, Object> map = new HashMap<String, Object>();
+		map.put("simple", list1);
+		map.put("professional", list2);
+		return ResultUtil.data(map, "获取成功");
 	}
 
 	@PostMapping(value = "/generateOrder")
@@ -211,10 +221,33 @@ public class QyzxBusinessController {
 		return ResultUtil.pageData(list, page.getTotal(), "查询成功");
 	}
 
+	public static void main(String[] args) {
+		QyzxInvoiceData qyzxInvoiceData = new QyzxInvoiceData();
+		qyzxInvoiceData.setBankAccount("123");
+		qyzxInvoiceData.setBankName("234");
+
+		if (!ObjectUtil.isAllNotEmpty(qyzxInvoiceData, qyzxInvoiceData.getBankAccount(),
+				qyzxInvoiceData.getBankName())) {
+			System.out.println("请完善发票信息！");
+		} else {
+			System.err.println("可以，不错");
+		}
+	}
+
 	@PostMapping(value = "/invoicing")
 	@ApiOperation(value = "开发票", httpMethod = "POST", notes = "接口发布说明")
 	public Result<QyzxInvoiceData> generateOrder(@CurrentUser UserBean userBean,
 			@RequestBody QyzxInvoiceData qyzxInvoiceData) {
+		if (!ObjectUtil.isAllNotEmpty(qyzxInvoiceData, qyzxInvoiceData.getInvoiceTitle(),
+				qyzxInvoiceData.getDutyParagraph(), qyzxInvoiceData.getCompanyAddress(),
+				qyzxInvoiceData.getCompanyPhone(), qyzxInvoiceData.getBankName(), qyzxInvoiceData.getBankAccount(),
+				qyzxInvoiceData.getInvoiceType(), qyzxInvoiceData.getInvoiceProject(),
+				qyzxInvoiceData.getInvoiceValue(), qyzxInvoiceData.getConsignee(), qyzxInvoiceData.getConsigneePhone(),
+				qyzxInvoiceData.getEmail(), qyzxInvoiceData.getShippingArea(), qyzxInvoiceData.getShippingAddress(),
+				qyzxInvoiceData.getZipCode())) {
+			return ResultUtil.error("请完善发票信息！");
+		}
+
 		String orderNo = qyzxInvoiceData.getOrderNo();
 		QyzxBuyRecord qyzxBuyRecord = QyzxBuyRecord.builder().build()
 				.selectOne(new LambdaQueryWrapper<QyzxBuyRecord>().eq(QyzxBuyRecord::getOrderNo, orderNo));