submit:发票修改

run-prod.sh

@@ -1,3 +1,42 @@
+#!/usr/bin/env bash
+# 定义应用组名
+group_name='zhongzheng'
+# 定义应用名称
+app_name='zhongzheng-saas-api'
+# 定义应用版本
+app_version='1.0-SNAPSHOT'
+# 定义应用环境
+profile_active='prod'
+echo '----copy jar----'
+docker stop ${app_name}
+echo '----stop container----'
+docker rm ${app_name}
+echo '----rm container----'
+docker rmi ${group_name}/${app_name}:${app_version}
+echo '----rm image----'
+# 打包编译docker镜像
+docker build -f /mydata/maven/build/Dockerfile -t ${group_name}/${app_name}:${app_version} .
+echo '----build image----'
+docker run -p 5055:5055 --name ${app_name} \
+--restart=always \
+-e 'spring.profiles.active'=${profile_active} \
+-e TZ="Asia/Shanghai" \
+-m 10240m \
+--cpus=3 \
+--log-opt max-size=50m \
+--log-opt max-file=3 \
+-v /etc/localtime:/etc/localtime \
+-v /usr/share/fonts:/usr/share/fonts \
+-v /data/logs/prod_api:/logs \
+-v /mydata/app/${app_name}/logs:/var/logs \
+-d ${group_name}/${app_name}:${app_version}
+echo '----start container----'
+
+echo "开始等待20秒..."
+# 1-10秒内随机
+sleep 5
+echo "等待后继续"
+
 #!/usr/bin/env bash
 # 定义应用组名
 group_admin_name='zhongzheng'
@@ -33,5 +72,45 @@ docker run \
 -d ${group_admin_name}/${app_admin_name}:${app_admin_version}
 echo '----start container admin----'
 
+echo "开始等待20秒..."
+# 1-10秒内随机
+sleep 5
+echo "等待后继续"
+
+#!/usr/bin/env bash
+# 定义应用组名
+group_admin_name='zhongzheng'
+# 定义应用名称
+app_admin_name='zhongzheng-saas-admin-top'
+# 定义应用版本
+app_admin_version='1.0-SNAPSHOT'
+# 定义应用环境
+profile_active='prod'
+echo '----copy jar admin top----'
+docker stop ${app_admin_name}
+echo '----stop container admin top----'
+docker rm ${app_admin_name}
+echo '----rm container admin top----'
+docker rmi ${group_admin_name}/${app_admin_name}:${app_admin_version}
+echo '----rm image admin top----'
+# 打包编译docker镜像
+docker build -f /mydata/maven/build/Dockerfile-saas -t ${group_admin_name}/${app_admin_name}:${app_admin_version} .
+echo '----build image admin top----'
+docker run \
+-p 7077:7077 \
+--name ${app_admin_name} \
+--restart=always \
+--log-opt max-size=50m \
+--log-opt max-file=3 \
+-e 'spring.profiles.active'=${profile_active} \
+-e TZ="Asia/Shanghai" \
+-v /etc/localtime:/etc/localtime \
+-v /usr/share/fonts:/usr/share/fonts \
+-v /data/logs/prod_admin_top:/logs \
+-v /mydata/app/${app_admin_name}/logs:/var/logs \
+-v /data/nginx/conf.d:/data/nginx/conf.d \
+-d ${group_admin_name}/${app_admin_name}:${app_admin_version}
+echo '----start container admin top----'
+
 
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/alioss/service/OssService.java

@@ -40,4 +40,6 @@ public interface OssService {
     InputStream getStreamByObject(String filePath) throws Exception;
 
     void processObject(String targetImage ,String sourceImage,String styleType) ;
+
+    String uploadWithUrl(OssRequest base, String pdfUrl);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/alioss/service/impl/OssServiceImpl.java

@@ -39,6 +39,8 @@ import javax.sql.rowset.serial.SerialBlob;
 import javax.sql.rowset.serial.SerialException;
 import java.awt.*;
 import java.io.*;
+import java.net.URL;
+import java.net.URLConnection;
 import java.sql.SQLException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -280,7 +282,12 @@ public class OssServiceImpl implements OssService {
         try {
             OssRequest ossRequest = new OssRequest();
             ossRequest.setImageStatus(imageStatus);
-            String fileName = generateRandomFilename(ossRequest) + ".jpg";
+            String fileName = null;
+            if(imageStatus<10){
+                fileName = generateRandomFilename(ossRequest) + ".jpg";
+            }else{
+                fileName = generateRandomFilename(ossRequest);
+            }
 
             //调用oss方法实现上传
             //第一个参数  Bucket名称
@@ -371,6 +378,35 @@ public class OssServiceImpl implements OssService {
         }
     }
 
+    @Override
+    public String uploadWithUrl(OssRequest base, String urlString){
+        String path = null;
+        InputStream inputStream = null;
+        try {
+            URL url = new URL(urlString);
+            URLConnection con = url.openConnection();
+            //获取上传文件输入流
+            inputStream =con.getInputStream();
+            path = uploadInputStream(inputStream,base.getImageStatus());
+
+            // 关闭OSSClient。
+            //ossClient.shutdown();
+            return path;
+        } catch (Exception e) {
+
+        }finally {
+            try {
+                if (null != inputStream) {
+                    inputStream.close();
+                }
+            }catch (IOException e){
+
+            }
+            return path;
+        }
+    }
+
+
     public void zipFile(List<String> fileList, ZipOutputStream zipOut,String dir) {
         if (CollectionUtils.isEmpty(fileList)) {
             return;

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderInvoiceServiceImpl.java

@@ -22,6 +22,8 @@ import com.zhongzheng.modules.order.service.IOrderInvoiceOrderService;
 import com.zhongzheng.modules.order.service.IOrderInvoiceService;
 import com.zhongzheng.modules.order.vo.OrderGoodsVo;
 import com.zhongzheng.modules.order.vo.OrderInvoiceVo;
+import com.zhongzheng.modules.system.domain.SysOldOrg;
+import com.zhongzheng.modules.system.service.ISysOldOrgService;
 import com.zhongzheng.modules.system.service.ISysUserService;
 import com.zhongzheng.modules.user.domain.User;
 import com.zhongzheng.modules.user.service.IUserService;
@@ -53,6 +55,9 @@ public class OrderInvoiceServiceImpl extends ServiceImpl<OrderInvoiceMapper, Ord
     @Autowired
     private IUserService userService;
 
+    @Autowired
+    private ISysOldOrgService sysOldOrgService;
+
     @Value("${invoice.host}")
     private String INVOICE_PATH;
 
@@ -142,6 +147,15 @@ public class OrderInvoiceServiceImpl extends ServiceImpl<OrderInvoiceMapper, Ord
                 iOrderInvoiceOrderService.insertByAddBo(item);
             }
         }
+        String tenantId = ServletUtils.getRequest().getHeader("TenantId");
+        SysOldOrg oldOrg = sysOldOrgService.getOne(new LambdaQueryWrapper<SysOldOrg>()
+                .eq(SysOldOrg::getTenantId, Long.valueOf(tenantId))
+                .eq(SysOldOrg::getStatus, 1)
+                .last("limit 1"));
+        if (ObjectUtils.isNotNull(oldOrg) && oldOrg.getOperationType() == 2){
+            //独立运营机构不需要开祥粤的发票
+            return true;
+        }
 
         //开发票
         OrderInvoiceBo invoiceBo = new OrderInvoiceBo();

zhongzheng-system/src/main/java/com/zhongzheng/modules/sdk/domain/TopNuoMplatformLog.java

@@ -63,4 +63,5 @@ private static final long serialVersionUID=1L;
     private String pushResult;
     private Integer pushStatus;
     private String xmlUrl;
+    private String ossPdfUrl;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/sdk/service/impl/TopNuoMplatformLogServiceImpl.java

@@ -11,6 +11,8 @@ import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ToolsUtils;
 import com.zhongzheng.common.utils.http.HttpUtils;
+import com.zhongzheng.modules.alioss.bo.OssRequest;
+import com.zhongzheng.modules.alioss.service.OssService;
 import com.zhongzheng.modules.grade.domain.ClassGradeUser;
 import com.zhongzheng.modules.grade.service.impl.UserPeriodServiceImpl;
 import com.zhongzheng.modules.order.domain.OrderGoodsRefund;
@@ -57,6 +59,8 @@ public class TopNuoMplatformLogServiceImpl extends ServiceImpl<TopNuoMplatformLo
     private String UpdateInvoice_PATH;
     @Autowired
     private ITopOldOrderService iTopOldOrderService;
+    @Autowired
+    private OssService ossService;
 
     @Override
     public TopNuoMplatformLogVo queryById(Long id){
@@ -220,6 +224,10 @@ public class TopNuoMplatformLogServiceImpl extends ServiceImpl<TopNuoMplatformLo
                             objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getXmlUrl, xmlUrl);
                             objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getStatus, 2);
                             objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getUpdateTime,DateUtils.getNowTime());
+                            OssRequest base = new OssRequest();
+                            base.setImageStatus(11);
+                            String ossPath = ossService.uploadWithUrl(base,pdfUrl);
+                            objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getOssPdfUrl, ossPath);
                         }else{
                             //失败
                             oldStatus = "2";

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/domain/SysOldOrg.java

@@ -48,5 +48,8 @@ private static final long serialVersionUID=1L;
     /** 分成模式 1机构分成 2业务员分成 */
     private Integer divideModel;
 
+    /** 运营模式 1代运营 2独立运营 */
+    private Integer operationType;
+
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -1504,7 +1504,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         if (mplatformLog.getStatus() == 2) {
             //开票完成
             invoice.setInvoiceStatus(2);//已开票
-            invoice.setInvoiceImg(mplatformLog.getPdfUrl());
+            invoice.setInvoiceImg(mplatformLog.getOssPdfUrl());
             List<OrderInvoiceOrder> invoiceOrderList = iOrderInvoiceOrderService
                     .list(new LambdaQueryWrapper<OrderInvoiceOrder>().eq(OrderInvoiceOrder::getInvoiceId, invoice.getInvoiceId()));
             if (CollectionUtils.isNotEmpty(invoiceOrderList)) {