Merge branch 'master-invoice-modular' of...

Merge branch 'master-invoice-modular' of http://113.105.137.151:22280/youjj/cloud-platform into master-invoice-modular

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderInvoice.java

@@ -114,4 +114,13 @@ public class OrderInvoice {
      */
     private String extend;
 
+    /**
+     * 1、开票成功，2、开票中
+     */
+    private Integer status;
+
+    /**
+     * 发票PDF路径
+     */
+    private String invoiceUrl;
 }
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderInvoiceBiz.java

 package com.xxfc.platform.order.biz;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
@@ -144,4 +146,22 @@ public class OrderInvoiceBiz extends BaseBiz<OrderInvoiceMapper, OrderInvoice> {
 		return ObjectRestResponse.succ(pageDataVO);
 	}
 
+	public ObjectRestResponse update(OrderInvoice orderInvoice) {
+		AppUserDTO appUserDTO = userFeign.userDetailByToken(request.getHeader("Authorization")).getData();
+		if (appUserDTO == null) {
+			return ObjectRestResponse.createFailedResult(ResultCode.RSTOKEN_EXPIRED_CODE, ResultCode.getMsg(ResultCode.RSTOKEN_EXPIRED_CODE));
+		}
+		if (orderInvoice == null || orderInvoice.getId() == null) {
+			return  ObjectRestResponse.paramIsEmpty();
+		}
+		OrderInvoice oldValue = mapper.selectByPrimaryKey(orderInvoice.getId());
+		if (oldValue != null) {
+			BeanUtil.copyProperties(orderInvoice, oldValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+			updateSelectiveByIdRe(oldValue);
+			return ObjectRestResponse.succ();
+		}
+		return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "发票不存在！");
+	}
+
+
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderInvoiceController.java

@@ -42,4 +42,9 @@ public class OrderInvoiceController extends BaseController<OrderInvoiceBiz, Orde
 		return baseBiz.getByParam(orderInvoiceDto);
 	}
 
+	@PostMapping(value = "/update")
+	public ObjectRestResponse update(@RequestBody OrderInvoice orderInvoice) {
+		return baseBiz.update(orderInvoice);
+	}
+
 }