小程序支付bug

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/controller/CardFuelDieselController.java

@@ -154,7 +154,7 @@ public class CardFuelDieselController extends BaseController {
             //描述
             activeApplet.setDiscountActiveDescribe("本充值活动,充值满"+
                     cardFuelDiesel.getRechargeBalance()+"元可以参加，所参与油品类型为："+activeApplet.getOilName()+"，锁价单价为："+
-                    cardFuelDiesel.getLockupPrice()+"元/L，总升数为："+cardFuelDiesel.getIncomeLitres()+"L，活动时间为：不限时间!");
+                    cardFuelDiesel.getLockPrice()+"元/L，活动时间为：不限时间!");
         }else {
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
             startFormat = simpleDateFormat.format(cardFuelDiesel.getStartTime());
@@ -163,7 +163,7 @@ public class CardFuelDieselController extends BaseController {
             //描述
             activeApplet.setDiscountActiveDescribe("本充值活动,充值满"+
                     cardFuelDiesel.getRechargeBalance()+"元可以参加，所参与油品类型为："+activeApplet.getOilName()+"，锁价单价为："+
-                    cardFuelDiesel.getLockupPrice()+"元/L，总升数为："+cardFuelDiesel.getIncomeLitres()+"L，活动时间为："+startFormat+"-"+endFormat);
+                    cardFuelDiesel.getLockPrice()+"元/L，活动时间为："+startFormat+"-"+endFormat);
         }
 
 
@@ -216,7 +216,7 @@ public class CardFuelDieselController extends BaseController {
             //描述
             activeApplet.setDiscountActiveDescribe("本充值活动,充值满"+
                     cardFuelDiesel.getRechargeBalance()+"元可以参加，所参与油品类型为："+activeApplet.getOilName()+"，锁价单价为："+
-                    cardFuelDiesel.getLockupPrice()+"元/L，总升数为："+cardFuelDiesel.getIncomeLitres()+"L，活动时间为：不限时间!");
+                    cardFuelDiesel.getLockPrice()+"元/L，活动时间为：不限时间!");
         }else {
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
             startFormat = simpleDateFormat.format(cardFuelDiesel.getStartTime());
@@ -225,7 +225,7 @@ public class CardFuelDieselController extends BaseController {
             //描述
             activeApplet.setDiscountActiveDescribe("本充值活动,充值满"+
                     cardFuelDiesel.getRechargeBalance()+"元可以参加，所参与油品类型为："+activeApplet.getOilName()+"，锁价单价为："+
-                    cardFuelDiesel.getLockupPrice()+"元/L，总升数为："+cardFuelDiesel.getIncomeLitres()+"L，活动时间为："+startFormat+"-"+endFormat);
+                    cardFuelDiesel.getLockPrice()+"元/L，活动时间为："+startFormat+"-"+endFormat);
         }
 
         activeApplet.setPoints(cardFuelDiesel.getPoints());

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java

@@ -56,7 +56,9 @@ import com.fuint.business.printer.service.PrinterService;
 import com.fuint.business.storeInformation.entity.LJStore;
 import com.fuint.business.storeInformation.service.ILJStoreService;
 import com.fuint.business.tag.entity.OilTag;
+import com.fuint.business.tag.entity.TagCode;
 import com.fuint.business.tag.service.OilTagService;
+import com.fuint.business.tag.service.TagCodeService;
 import com.fuint.business.tag.util.TagUtils;
 import com.fuint.business.userManager.entity.ChainStoreConfig;
 import com.fuint.business.userManager.entity.LJUser;
@@ -1727,9 +1729,12 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
     @Resource
     private PrinterService printerService;
 
+    @Resource
+    private TagCodeService tagCodeService;
     @Override
     public int updateOrderStatus(String orderNo, String status) throws Exception {
         int row = 0;
+        String staffId ="";
         OilOrder oilOrder = this.selectOilOrderByOrderNo(orderNo);
         Integer userId = oilOrder.getUserId();
         LJUser user = null;
@@ -1747,6 +1752,13 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
                         LambdaQueryWrapper<OilTag> queryWrapper = new LambdaQueryWrapper<>();
                         queryWrapper.eq(OilTag::getTagCodeSn, oilTagSn);
                         OilTag oilTag = oilTagService.getOne(queryWrapper);
+                        Integer tagCodeId = oilTag.getTagCodeId();
+                        TagCode tagCode = tagCodeService.getById(tagCodeId);
+                        String[] staffIds = tagCode.getCollection().split("staffId");
+                        if (staffIds.length > 1){
+                            staffId = staffIds[1];
+                            oilOrder.setStaffId(Integer.parseInt(staffId));
+                        }
                         if (ObjectUtils.isNotEmpty(oilTag)) {
                             hashMap.put("devName", oilTag.getSnCode());
                         }

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

@@ -12,6 +12,7 @@ import com.fuint.business.tag.service.TagCodeService;
 import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.util.TokenUtil;
 import com.fuint.module.backendApi.controller.BackendFileController;
+import com.fuint.system.dept.service.ISysDeptService;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.mock.web.MockMultipartFile;
@@ -35,6 +36,9 @@ public class OilTagServiceImpl extends ServiceImpl<OilTagMapper, OilTag> impleme
     @Resource
     private TagCodeService tagCodeService;
 
+    @Resource
+    private ISysDeptService iSysDeptService;
+
 
     @Override
     public boolean add(OilTag oilTag) throws Exception {
@@ -44,6 +48,7 @@ public class OilTagServiceImpl extends ServiceImpl<OilTagMapper, OilTag> impleme
         oilTag.setTerminalNumber(number+"");
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
         oilTag.setDeptId(Integer.parseInt(nowAccountInfo.getDeptId().toString()));
+        oilTag.setDeptIds(iSysDeptService.selectDeptById(nowAccountInfo.getDeptId()).getAncestors() + ","+nowAccountInfo.getDeptId());
 
         LambdaQueryWrapper<TagCode> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(TagCode::getTagCodeSn, oilTag.getTagCodeSn());