Aidea product update by Strive Date 2020-11-28

aidea-modules/invoice-module/src/main/java/com/cftech/invoice/dao/InvoiceMapper.xml

@@ -25,6 +25,7 @@
         <result column="update_by" property="updateBy"/>
         <result column="operator" property="operator"/>
         <result column="openId" property="openId"/>
+        <result column="number" property="number"/>
     </resultMap>
 
     <sql id="sqlWhere">
@@ -56,6 +57,7 @@
 
     <sql id="sqlColumns">
                                     id,
+                                    number,
                                                 invoice_title,
                                                 invoice_content,
                                                 unit_tax_number,
@@ -89,6 +91,7 @@
         values
         (
         #{id, jdbcType=BIGINT},
+        #{number, jdbcType=VARCHAR},
         #{invoiceTitle, jdbcType=VARCHAR},
         #{invoiceContent, jdbcType=VARCHAR},
         #{unitTaxNumber, jdbcType=VARCHAR},
@@ -141,6 +144,9 @@
             <if test="id != null">
                 id = #{id, jdbcType=BIGINT},
             </if>
+            <if test="number != null">
+                number = #{number, jdbcType=VARCHAR},
+            </if>
             <if test="invoiceTitle != null">
                 invoice_title = #{invoiceTitle, jdbcType=VARCHAR},
             </if>

aidea-modules/invoice-module/src/main/java/com/cftech/invoice/model/Invoice.java

@@ -17,6 +17,7 @@ public class Invoice implements Serializable {
 
     /** 主键id */
     private Long id;
+    private String number;
     /** 发票抬头 */
     @ExportConfig(value = "发票抬头", width = 100, showLevel = 1)
     private String invoiceTitle;

aidea-modules/invoice-module/src/main/java/com/cftech/invoice/web/InvoiceController.java

@@ -8,7 +8,6 @@ import com.cftech.core.scope.OrderType;
 import com.cftech.core.sql.Conds;
 import com.cftech.core.sql.Sort;
 import com.cftech.core.util.Constants;
-import com.cftech.sys.security.PermissionSign;
 import com.cftech.sys.security.UserUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.authz.annotation.RequiresPermissions;

aidea-modules/order-module/src/main/java/com/cftech/order/job/OrderExpiredRemindJob.java

@@ -22,7 +22,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * 订单过期提醒
+ * 待付款订单，半小时未付款自动取消
  * Created by 16444 on 2020/11/24.
  */
 @Slf4j

aidea-modules/order-module/src/main/java/com/cftech/order/utils/InvoiceUtil.java

@@ -3,6 +3,7 @@ package com.cftech.order.utils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.cftech.base.codingrule.utils.CodingruleUtils;
 import com.cftech.core.util.StringUtils;
 import com.cftech.core.util.SystemConfig;
 import com.cftech.order.model.Order;
@@ -93,7 +94,7 @@ public class InvoiceUtil {
         //销方电话  必填
         order.put("salerTel",SystemConfig.p.getProperty("SALER_TEL"));
         //订单号 （每个企业唯一） 必填
-        order.put("orderNo","OD19980119"); //todo
+        order.put("orderNo", orderObj.getNumber()); //todo
         // 开票完成回传发票信息地址  非必填
         order.put("callBackUrl","http:127.0.0.1/invoice/callback/");
         // 购方名称  必填

aidea-modules/order-module/src/main/java/com/cftech/order/web/OrderController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.cftech.base.codingrule.utils.CodingruleUtils;
 import com.cftech.core.util.SystemConfig;
 import com.cftech.invoice.model.Invoice;
 import com.cftech.invoice.service.InvoiceService;
@@ -91,6 +92,9 @@ public class OrderController {
     @Autowired
     private UserService userService;
 
+    @Autowired
+    private CodingruleUtils codingruleUtils;
+
     //列表页面
     @RequiresPermissions(value = ORDER_VIEW)
     @RequestMapping("/list")
@@ -268,6 +272,7 @@ public class OrderController {
                         String invoiceSerialNum = json.getJSONObject("result").getString("invoiceSerialNum");
                         Invoice invoice = new Invoice();
                         //发票抬头
+                        invoice.setNumber(codingruleUtils.getNumber(accountsId, Invoice.class.getName()));
                         invoice.setInvoiceTitle(order.getNickName());
                         invoice.setInvoiceContent("商品费用");
                         invoice.setInvoiceType("1");