fix

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/common/CommonController.java

@@ -3,10 +3,13 @@ package com.zhongzheng.controller.common;
 import cn.hutool.core.lang.Validator;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.zhongzheng.common.annotation.Log;
 import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.core.redis.RedisCache;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.common.utils.ToolsUtils;
@@ -32,6 +35,8 @@ import com.zhongzheng.modules.goods.vo.GoodsSpecTemplateVo;
 import com.zhongzheng.modules.goods.vo.GoodsUserVo;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
 import com.zhongzheng.modules.order.domain.Printer;
+import com.zhongzheng.modules.sdk.bo.TopNuoMplatformLogAddBo;
+import com.zhongzheng.modules.sdk.service.ITopNuoMplatformLogService;
 import com.zhongzheng.modules.sdk.service.NuonuoService;
 import com.zhongzheng.modules.system.bo.SysTenantQueryBo;
 import com.zhongzheng.modules.system.service.ISysConfigService;
@@ -44,6 +49,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.text.ParseException;
@@ -63,12 +69,21 @@ import java.util.Map;
 @RequestMapping("/sys/common/")
 public class CommonController extends BaseController {
 
-    private final NuonuoService nuonuoService;
 
+    private final ITopNuoMplatformLogService iTopNuoMplatformLogService;
 
-    @ApiOperation("获取nuonuo信息")
-    @GetMapping("/nuonuo/token")
-    public AjaxResult<Void> getNuo() {
-        return AjaxResult.success(nuonuoService.getAccessToken());
+
+    /**
+     * 新增诺税通开单记录
+     */
+    @ApiOperation("新增诺税通开单记录")
+    @PreAuthorize("@ss.hasPermi('system:log:add')")
+    @Log(title = "诺税通开单记录", businessType = BusinessType.INSERT)
+    @PostMapping("/openMplatform/log")
+    public AjaxResult<Map<String, String>> add(@RequestBody TopNuoMplatformLogAddBo bo) {
+        if(!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(),bo.getSign())){
+            throw new CustomException("签名错误");
+        }
+        return AjaxResult.success(iTopNuoMplatformLogService.insertByAddBo(bo));
     }
 }

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/sdk/TopNuoMplatformLogController.java

@@ -68,39 +68,5 @@ public class TopNuoMplatformLogController extends BaseController {
         return AjaxResult.success(iTopNuoMplatformLogService.queryById(id));
     }
 
-    /**
-     * 新增诺税通开单记录
-     */
-    @ApiOperation("新增诺税通开单记录")
-    @PreAuthorize("@ss.hasPermi('system:log:add')")
-    @Log(title = "诺税通开单记录", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Map<String, String>> add(@RequestBody TopNuoMplatformLogAddBo bo) {
-        if(!ToolsUtils.checkSignFromOldSys(bo.getStamp().toString(),bo.getSign())){
-            throw new CustomException("签名错误");
-        }
-        return AjaxResult.success(iTopNuoMplatformLogService.insertByAddBo(bo));
-    }
-
-    /**
-     * 修改诺税通开单记录
-     */
-    @ApiOperation("修改诺税通开单记录")
-    @PreAuthorize("@ss.hasPermi('system:log:edit')")
-    @Log(title = "诺税通开单记录", businessType = BusinessType.UPDATE)
-    @PutMapping()
-    public AjaxResult<Void> edit(@RequestBody TopNuoMplatformLogEditBo bo) {
-        return toAjax(iTopNuoMplatformLogService.updateByEditBo(bo) ? 1 : 0);
-    }
 
-    /**
-     * 删除诺税通开单记录
-     */
-    @ApiOperation("删除诺税通开单记录")
-    @PreAuthorize("@ss.hasPermi('system:log:remove')")
-    @Log(title = "诺税通开单记录" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
-        return toAjax(iTopNuoMplatformLogService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
-    }
 }

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

@@ -51,4 +51,6 @@ public interface ITopNuoMplatformLogService extends IService<TopNuoMplatformLog>
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+	Boolean updateByBatch(TopNuoMplatformLogEditBo bo);
 }

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

@@ -94,12 +94,13 @@ public class TopNuoMplatformLogServiceImpl extends ServiceImpl<TopNuoMplatformLo
         TopNuoMplatformLog add = BeanUtil.toBean(bo, TopNuoMplatformLog.class);
         validEntityBeforeSave(add);
         add.setFromPlat(2);
+        add.setStatus(0);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
         if(this.save(add)){
             Long id = add.getId();
             Map<String,String> params = new HashMap<>();
-            params.put("",bo.getContent());
+            params.put("content",bo.getContent());
             String result = nuonuoService.openMplatform(params);
             TopNuoMplatformLog update = new TopNuoMplatformLog();
             update.setId(id);
@@ -115,15 +116,18 @@ public class TopNuoMplatformLogServiceImpl extends ServiceImpl<TopNuoMplatformLo
                 update.setInvoiceSerialNum(invoiceSerialNum);
                 update.setStatus(1);
                 rs.put("invoiceSerialNum",invoiceSerialNum);
+                update.setUpdateTime(DateUtils.getNowTime());
+                updateById(update);
+
+                rs.put("code",code);
+                rs.put("describe",describe);
+                return rs;
             }else{
                 update.setStatus(-1);
+                update.setUpdateTime(DateUtils.getNowTime());
+                updateById(update);
+                throw new CustomException(result);
             }
-            update.setUpdateTime(DateUtils.getNowTime());
-            updateById(update);
-
-            rs.put("code",code);
-            rs.put("describe",describe);
-            return rs;
         }
         throw new CustomException("新增失败");
     }
@@ -152,4 +156,20 @@ public class TopNuoMplatformLogServiceImpl extends ServiceImpl<TopNuoMplatformLo
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    public Boolean updateByBatch(TopNuoMplatformLogEditBo bo) {
+        TopNuoMplatformLogQueryBo queryBo = new TopNuoMplatformLogQueryBo();
+        queryBo.setStatus(1);
+        List<TopNuoMplatformLogVo> list = queryList(queryBo);
+        List<String> snList = new ArrayList<>();
+        for(int i=0;i<list.size();i++){
+            TopNuoMplatformLogVo vo = list.get(i);
+            snList.add(vo.getInvoiceSerialNum());
+            if(snList.size()==10||i==(list.size()-1)){
+                String result = nuonuoService.queryInvoiceResult(snList);
+            }
+        }
+        return null;
+    }
 }