Aidea product update by Strive Date 2020-11-28

aidea-modules/invoice-module/src/main/java/com/cftech/invoice/service/impl/InvoiceServiceImpl.java

@@ -46,11 +46,12 @@ public class InvoiceServiceImpl extends GenericServiceImpl<Invoice> implements I
     public JSONObject selectInvoiceDetail(InvoiceDetail invoiceDetail) {
         JSONObject jsonObject = new JSONObject();
         MpAccountsEntity mpAccountsEntity = null;
-        if (StringUtils.isNotBlank(invoiceDetail.getAppId())){
+        if (StringUtils.isNotBlank(invoiceDetail.getAppId())) {
              mpAccountsEntity = mpAccountsService.getMpAccountsAppid(invoiceDetail.getAppId());
-        }else{
+        } else {
             jsonObject.put("errorNo","2");
             jsonObject.put("errorMsg","appId不能为空");
+            return jsonObject;
         }
 
         try {

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

@@ -6,7 +6,6 @@ import com.cftech.invoice.service.InvoiceService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -25,7 +24,7 @@ public class MobileInvoiceController {
      * @return
      */
     @RequestMapping(value = "/invoiceDetail", method = {RequestMethod.POST}, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public JSONObject invoiceDetail (@RequestBody InvoiceDetail invoiceDetail){
+    public JSONObject invoiceDetail (InvoiceDetail invoiceDetail){
         return invoiceService.selectInvoiceDetail(invoiceDetail);
     }
 

aidea-modules/order-module/src/main/java/com/cftech/order/dao/OrderMapper.xml

@@ -566,12 +566,14 @@
             t.order_cancel AS orderCancel,
             t.status,
             DATE_FORMAT(t.create_time,'%Y-%m-%d %h:%i:%s')  AS createTime,
+            DATE_FORMAT(t.order_time,'%Y-%m-%d %h:%i:%s')  AS orderTime,
             s.address_name AS addressName,
             a.areaname AS province,
             b.areaname AS city,
             c.areaname AS area,
             s.phone,
-            s.address
+            s.address,
+            t.confirm
         FROM
           t_order t
         LEFT JOIN t_order_details d  ON  t.id =d.order_id

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

 package com.cftech.order.job;
 
+import com.cftech.accounts.model.MpAccountsEntity;
 import com.cftech.accounts.model.SysJob;
 import com.cftech.accounts.service.JobService;
+import com.cftech.accounts.service.MpAccountsService;
+import com.cftech.base.org.api.QyMsgUtil;
+import com.cftech.base.org.model.Qyuser;
+import com.cftech.base.org.service.QyuserService;
 import com.cftech.core.sql.Conds;
 import com.cftech.core.util.Constants;
 import com.cftech.core.util.SpringContextHolder;
@@ -18,6 +23,7 @@ import org.quartz.JobExecutionException;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -37,6 +43,11 @@ public class OrderFollowupRemindJob implements Job {
         }
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Long accounts = Long.parseLong(SystemConfig.p.getProperty("QY_SEND_APPID"));
+        MpAccountsService mpAccountsService= SpringContextHolder.getBean(MpAccountsService.class);
+        MpAccountsEntity accountsEntity = mpAccountsService.getDetail(accounts);
+        Long agenId = Long.parseLong(accountsEntity.getAgentId());
+        String msg = SystemConfig.p.getProperty("QY_SEND_SERVICE_FOLLOWUP_MSG");
 
         Conds orderConds = new Conds();
         orderConds.equal("o.del_flag", Constants.DEL_FLAG_0);
@@ -80,7 +91,13 @@ public class OrderFollowupRemindJob implements Job {
 
                 Date nowDate = sdf.parse(sdf.format(new Date()));
                 if (date.compareTo(nowDate) == 0) {
-
+                    QyuserService qyuserService = SpringContextHolder.getBean(QyuserService.class);
+                    Qyuser serverUser = qyuserService.fetchById(order.getServiceId());
+                    List<Qyuser> serviceUsers = new ArrayList();
+                    serviceUsers.add(serverUser);
+                    QyMsgUtil qyMsgUtil = SpringContextHolder.getBean(QyMsgUtil.class);
+                    msg += msg + order.getNumber();
+                    qyMsgUtil.sendText(accounts, false, serviceUsers, null, null, agenId, msg, false);
                 }
             } catch (ParseException e) {
                 e.printStackTrace();

aidea-modules/order-module/src/main/java/com/cftech/order/model/OrderMobile.java

@@ -46,6 +46,11 @@ public class OrderMobile {
     private String city;
     /*区县*/
     private String area;
+
+    private String orderTime;
+
+    private String confirm;
+
     private List<ProductMobile> ProductMobile;
 
 }

aidea-modules/order-module/src/main/java/com/cftech/order/service/impl/OrderServiceImpl.java

@@ -307,9 +307,9 @@ public class OrderServiceImpl extends GenericServiceImpl<Order> implements Order
 
         try {
             Conds conds = new Conds();
-            conds.in("o.id",invoiceDto.getId().split(","));
+            conds.equal("o.id", invoiceDto.getId());
             conds.equal("o.del_flag", Constants.DEL_FLAG_0);
-            List<Order> list = orderMapper.fetchSearchBy(conds, null, 0, 0, null);
+            List<Order> list = this.fetchSearchBy(conds, null, 0, 0, null);
             if(list.size() > 0){
                 for (Order order : list){
                     SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

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

@@ -66,7 +66,7 @@ public class MobileOrderController {
      * @return
      */
     @RequestMapping(value = "/invoice", method = {RequestMethod.POST}, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public JSONObject invoice(@RequestBody InvoiceDto invoiceDto){
+    public JSONObject invoice(InvoiceDto invoiceDto){
         return orderService.invoice(invoiceDto);
     }
 }

aidea-modules/product-module-web/src/main/webapp/WEB-INF/views/product/productform.html

@@ -104,6 +104,14 @@
                                 >
                             </div>
 
+                            <div class="form-group form-md-line-input col-md-12">
+                                <label>产品编码</label>
+                                <input type="text" required class="form-control pull-right"
+                                       value="$!{data.productNumber}" maxlength="500" required
+                                       name="productNumber" placeholder="剂型"
+                                >
+                            </div>
+
                             <div class="form-group form-md-line-input col-md-12">
                                 <label>通用名</label>
                                 <input type="text" required class="form-control pull-right"

aidea-modules/product-module/src/main/java/com/cftech/product/dao/ProductMapper.xml

@@ -287,6 +287,9 @@
             <if test="format != null">
                 format = #{format, jdbcType=VARCHAR},
             </if>
+            <if test="productNumber != null">
+                product_number = #{productNumber, jdbcType=VARCHAR},
+            </if>
             <if test="approveNumber != null">
                 approve_number = #{approveNumber, jdbcType=VARCHAR},
             </if>

aidea-modules/product-module/src/main/java/com/cftech/product/web/ProductController.java

@@ -107,7 +107,9 @@ public class ProductController {
             } else {
                 product.setAccountsId(accountsId);
                 product.setDelFlag(false);
-                product.setProductNumber(codingruleUtils.getNumber(accountsId,Product.class.getName()));
+                if (StringUtils.isBlank(product.getProductNumber())) {
+                    product.setProductNumber(codingruleUtils.getNumber(accountsId,Product.class.getName()));
+                }
                 product.setAccountsId(UserUtils.getmpaccounts(request));
                 product.setCreateBy(UserUtils.getUser().getId());
                 product.setUpdateBy(UserUtils.getUser().getId());

aidea-modules/waybill-module/pom.xml

@@ -32,5 +32,10 @@
             <artifactId>shipping-address-module</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.cftech</groupId>
+            <artifactId>logistics-module</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 </project>

aidea-modules/waybill-module/src/main/java/com/cftech/waybill/utils/ExpressOrderInfoUtils.java

@@ -256,7 +256,6 @@ public class ExpressOrderInfoUtils {
             retObj.put("trackingType", 1);//1:根据顺丰运单号查询
 
             JSONArray waybills = new JSONArray();
-            //waybills.add("SF7444420632664");
             retObj.put("trackingNumber", waybills);//顺丰运单号
             retObj.put("methodType", 1);//标准路由查询
         } catch (Exception e) {