小程序支付bug

fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/PrintIntegralReport.java

@@ -33,7 +33,7 @@ public class PrintIntegralReport {
             List<Map<String,String>> o = (List<Map<String,String>>)handover.get("shoppingCart");
             for (Map<String, String> stringStringMap : o) {
                 sb.append("<tr><td>"+stringStringMap.get("giftName")+"</td>");
-                sb.append("<td>"+((ObjectUtil.isNotEmpty(stringStringMap.get("markPurchases")))?stringStringMap.get("markPurchases").toString():"0"+"</td>");
+                sb.append("<td>"+((ObjectUtil.isNotEmpty(stringStringMap.get("markPurchases")))?stringStringMap.get("markPurchases").toString():"0"+"</td>"));
                 sb.append("<td>"+ stringStringMap.get("price")+"</td></tr>");
             }
             sb.append("</table>");

fuintBackend/fuint-application/src/main/java/com/fuint/business/tag/controller/TagCodeRecordController.java

@@ -83,7 +83,18 @@ public class TagCodeRecordController extends BaseController {
         tagCodeRecord.setId(tagCodeRecordDTO.getId());
         tagCodeRecord.setStaffId(tagCodeRecordDTO.getStaffId());
         tagCodeRecord.setStaffName(ljStaff.getRealName());
-        tagCodeService.selectByTagCodeSn(tagCodeRecordDTO.getTagCodeSn());
+        TagCodeRecord tagCodeRecord1 = tagCodeRecordService.getById(tagCodeRecordDTO.getId());
+        OilTag oilTag = oilTagService.getById(tagCodeRecord1.getOilTagId());
+        TagCode tagCode = tagCodeService.selectByTagCodeSn(oilTag.getTagCodeSn());
+        String collection = tagCode.getCollection();
+        if(collection.contains("staffId")){
+            String[] split = collection.split("&staffId");
+            collection = split[0]+"&staffId="+tagCodeRecordDTO.getStaffId();
+        }else {
+            collection = collection+"&staffId="+tagCodeRecordDTO.getStaffId();
+        }
+        tagCode.setCollection(collection);
+        tagCodeService.updateById(tagCode);
         return getSuccessResult(this.tagCodeRecordService.updateById(tagCodeRecord));
     }
     // 一键解绑
@@ -189,8 +200,6 @@ public class TagCodeRecordController extends BaseController {
         return getSuccessResult("该员工暂未绑定码牌！");
     }
 
-    @Resource
-    private TagCodeService tagCodeService;
     /**
      * 码牌与油站解绑
      *

fuintBackend/fuint-application/src/main/java/com/fuint/business/tag/service/impl/TagCodeServiceImpl.java

@@ -59,6 +59,9 @@ public class TagCodeServiceImpl extends ServiceImpl<TagCodeMapper, TagCode> impl
     @Autowired
     private BackendFileController backendFileController;
 
+    @Autowired
+    private TagCodeMapper tagCodeMapper;
+
     @Override
     @Transactional
     public ResponseEntity<InputStreamResource> add(TagCodeDTO tagCodeDTO, HttpServletRequest request, HttpServletResponse response) throws Exception {
@@ -170,8 +173,9 @@ public class TagCodeServiceImpl extends ServiceImpl<TagCodeMapper, TagCode> impl
     @Override
     public TagCode selectByTagCodeSn(String tagCodeSn) {
         LambdaQueryWrapper<TagCode> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(TagCode::getTagCodeSn, tagCodeSn)
+        queryWrapper.eq(TagCode::getTagCodeSn, tagCodeSn);
-        return null;
+        TagCode tagCodes = tagCodeMapper.selectOne(queryWrapper);
+        return tagCodes;
     }
 
     private List<File> getImageFiles(String directory) {