修改用户二维码生成

src/main/java/com/pangding/web/authority/controller/company/CompanyTollPointController.java

+package com.pangding.web.authority.controller.company;
+
+
+import com.pangding.web.authority.service.company.CompanyTollPointService;
+import com.pangding.web.vo.system.pd.company.CompanyTollPointVo;
+import com.pangding.web.vo.system.req.company.CompanyTollPointReqVo;
+import com.pangding.web.vo.system.res.company.CompanyTollPointResVo;
+import com.yanzuoguang.util.vo.PageSizeData;
+import com.yanzuoguang.util.vo.ResponseResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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;
+
+import java.util.List;
+
+
+@RestController
+@RequestMapping(value = "/companyTollPoint", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+@Api(value = "公司收费点相关类", description = "收费点新增、修改、删除等操作")
+public class CompanyTollPointController {
+
+    private CompanyTollPointService companyTollPointService;
+
+    public CompanyTollPointController(CompanyTollPointService companyTollPointService) {
+        this.companyTollPointService = companyTollPointService;
+    }
+
+    @RequestMapping(value = "/queryPageList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @ApiOperation(value = "查询收费点列表", notes = "返回公司收费点列表信息")
+    public ResponseResult<PageSizeData<CompanyTollPointResVo>> queryPageList(@RequestBody CompanyTollPointReqVo req) {
+        return ResponseResult.result(companyTollPointService.queryPageList(req));
+    }
+
+    @RequestMapping(value = "/queryList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @ApiOperation(value = "查询收费点列表", notes = "返回公司收费点列表信息")
+    public ResponseResult<List<CompanyTollPointVo>> queryList(@RequestBody CompanyTollPointReqVo req) {
+        return ResponseResult.result(companyTollPointService.queryList(req));
+    }
+
+    @RequestMapping(value = "/save", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @ApiOperation(value = "保存公司收费点", notes = "返回公司收费点信息")
+    public ResponseResult<CompanyTollPointVo> save(@RequestBody CompanyTollPointReqVo req) {
+        return ResponseResult.result(companyTollPointService.save(req));
+    }
+
+    @RequestMapping(value = "/queryCompanyTollPoint", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @ApiOperation(value = "查询公司收费点详情", notes = "返回公司收费点详情")
+    public ResponseResult<CompanyTollPointVo> queryCompanyTollPoint(@RequestBody CompanyTollPointReqVo req) {
+        return ResponseResult.result(companyTollPointService.queryCompanyTollPoint(req));
+    }
+
+
+    @RequestMapping(value = "/delCompanyTollPoint", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @ApiOperation(value = "删除公司收费点", notes = "返回删除结果")
+    public ResponseResult<String> delCompanyTollPoint(@RequestBody CompanyTollPointReqVo req) {
+        companyTollPointService.delCompanyTollPoint(req);
+        return ResponseResult.result("处理完成");
+    }
+
+
+
+}

src/main/java/com/pangding/web/authority/dao/company/CompanyTollPointDao.java

+package com.pangding.web.authority.dao.company;
+
+import com.pangding.web.vo.system.req.company.CompanyTollPointReqVo;
+import com.pangding.web.vo.system.res.company.CompanyTollPointResVo;
+import com.yanzuoguang.dao.BaseDao;
+import com.yanzuoguang.util.vo.PageSizeData;
+
+public interface CompanyTollPointDao extends BaseDao {
+
+    PageSizeData<CompanyTollPointResVo> queryPageList(CompanyTollPointReqVo req);
+
+}

src/main/java/com/pangding/web/authority/dao/company/impl/CompanyTollPointDaoImpl.java

+package com.pangding.web.authority.dao.company.impl;
+
+import com.pangding.web.authority.dao.company.CompanyTollPointDao;
+import com.pangding.web.vo.system.pd.company.CompanyTollPointVo;
+import com.pangding.web.vo.system.req.company.CompanyTollPointReqVo;
+import com.pangding.web.vo.system.res.company.CompanyTollPointResVo;
+import com.yanzuoguang.dao.impl.BaseDaoImpl;
+import com.yanzuoguang.util.vo.PageSizeData;
+import org.springframework.stereotype.Component;
+
+@Component
+public class CompanyTollPointDaoImpl extends BaseDaoImpl implements CompanyTollPointDao {
+
+    private final String QUERY_PAGE_LIST = "QUERY_PAGE_LIST";
+
+    @Override
+    protected void init() {
+
+        register(CompanyTollPointVo.class);
+
+        table.add(QUERY_PAGE_LIST,"select a.*,b.name as companyName from pd_company_point a left join pd_company b on a.company_id = b.id " +
+                "where 1=1{WHERE} ")
+                .add("companyId","and a.company_id = ?");
+
+    }
+
+    @Override
+    public PageSizeData<CompanyTollPointResVo> queryPageList(CompanyTollPointReqVo req) {
+        return this.queryPage(CompanyTollPointResVo.class, req, QUERY_PAGE_LIST, req);
+    }
+
+}

src/main/java/com/pangding/web/authority/mq/CompanyConsumer.java

@@ -91,18 +91,26 @@ public class CompanyConsumer {
         }
     }
 
+//    @RabbitListener(queues = {MqConstant.SAVE_CAPITAL_FLOW})
+//    public void saveCapitalFlow(String content, Message message, Channel channel) {
+//        try {
+//            CapitalFlowReqVo capitalFlowReqVo = JsonHelper.deserialize(content, CapitalFlowReqVo.class);
+//            financeService.saveCapitalFlow(capitalFlowReqVo);
+//        } catch (Exception e) {
+//            Log.error(CompanyConsumer.class, e);
+//            mqService.message(new MessageVo(MqConstant.SAVE_CAPITAL_FLOW, MqConstant.SAVE_CAPITAL_FLOW,
+//                    content, 2000));
+//        } finally {
+//            mqService.basicAck(message, channel);
+//        }
+//    }
+
     @RabbitListener(queues = {MqConstant.SAVE_CAPITAL_FLOW})
     public void saveCapitalFlow(String content, Message message, Channel channel) {
-        try {
+        mqService.basicHandle(message, channel, MqConstant.SAVE_CAPITAL_FLOW, content, 300, (contentTemp) -> {
             CapitalFlowReqVo capitalFlowReqVo = JsonHelper.deserialize(content, CapitalFlowReqVo.class);
             financeService.saveCapitalFlow(capitalFlowReqVo);
-        } catch (Exception e) {
-            Log.error(CompanyConsumer.class, e);
-            mqService.message(new MessageVo(MqConstant.SAVE_CAPITAL_FLOW, MqConstant.SAVE_CAPITAL_FLOW,
-                    content, 2000));
-        } finally {
-            mqService.basicAck(message, channel);
-        }
+        });
     }
 
     @RabbitListener(queues = {MqConstant.COMPANY_MSG})

src/main/java/com/pangding/web/authority/service/company/CompanyTollPointService.java

+package com.pangding.web.authority.service.company;
+
+import com.pangding.web.vo.system.pd.company.CompanyTollPointVo;
+import com.pangding.web.vo.system.req.company.CompanyTollPointReqVo;
+import com.pangding.web.vo.system.res.company.CompanyTollPointResVo;
+import com.yanzuoguang.util.vo.PageSizeData;
+
+import java.util.List;
+
+public interface CompanyTollPointService {
+
+    PageSizeData<CompanyTollPointResVo> queryPageList(CompanyTollPointReqVo req);
+
+    CompanyTollPointVo save(CompanyTollPointReqVo req);
+
+    List<CompanyTollPointVo> queryList(CompanyTollPointReqVo req);
+
+    CompanyTollPointVo queryCompanyTollPoint(CompanyTollPointReqVo req);
+
+    void delCompanyTollPoint(CompanyTollPointReqVo req);
+
+
+}

src/main/java/com/pangding/web/authority/service/company/impl/CompanyTollPointServiceImpl.java

+package com.pangding.web.authority.service.company.impl;
+
+import com.pangding.web.authority.dao.company.CompanyTollPointDao;
+import com.pangding.web.authority.service.company.CompanyTollPointService;
+import com.pangding.web.vo.system.pd.company.CompanyTollPointVo;
+import com.pangding.web.vo.system.req.company.CompanyTollPointReqVo;
+import com.pangding.web.vo.system.res.company.CompanyTollPointResVo;
+import com.yanzuoguang.util.base.ObjectHelper;
+import com.yanzuoguang.util.helper.StringHelper;
+import com.yanzuoguang.util.vo.PageSizeData;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class CompanyTollPointServiceImpl implements CompanyTollPointService {
+
+    private CompanyTollPointDao companyTollPointDao;
+
+    public CompanyTollPointServiceImpl(CompanyTollPointDao companyTollPointDao) {
+        this.companyTollPointDao = companyTollPointDao;
+    }
+
+    public PageSizeData<CompanyTollPointResVo> queryPageList(CompanyTollPointReqVo req) {
+
+        PageSizeData<CompanyTollPointResVo> companyTollPointVo = companyTollPointDao.queryPageList(req);
+
+        return companyTollPointVo;
+    }
+
+    public CompanyTollPointVo save(CompanyTollPointReqVo req) {
+
+        CompanyTollPointReqVo companyTollPointReqVo = new CompanyTollPointReqVo();
+        companyTollPointReqVo.setCompanyId(req.getCompanyId());
+        companyTollPointReqVo.setTollPoints(req.getTollPoints());
+        CompanyTollPointVo companyTollPointVo = companyTollPointDao.load(companyTollPointReqVo, CompanyTollPointVo.class);
+        if (StringHelper.isEmpty(companyTollPointVo)) {
+            companyTollPointVo = new CompanyTollPointVo();
+            ObjectHelper.writeWithFromClass(companyTollPointVo, req);
+            companyTollPointVo.setCompanyPointId(StringHelper.getNewID());
+            companyTollPointDao.create(companyTollPointVo);
+        } else {
+            ObjectHelper.writeWithFromClass(companyTollPointVo, req);
+            companyTollPointVo.setCompanyPointId(companyTollPointVo.getCompanyPointId());
+            companyTollPointDao.update(companyTollPointVo);
+        }
+        return companyTollPointVo;
+    }
+
+    public CompanyTollPointVo queryCompanyTollPoint(CompanyTollPointReqVo req) {
+
+        CompanyTollPointVo companyTollPointVo = companyTollPointDao.load(req, CompanyTollPointVo.class);
+
+        return companyTollPointVo;
+    }
+
+    public List<CompanyTollPointVo> queryList(CompanyTollPointReqVo req) {
+
+        List<CompanyTollPointVo> companyTollPointVo = companyTollPointDao.loadList(req, CompanyTollPointVo.class);
+
+        return companyTollPointVo;
+    }
+
+    public void delCompanyTollPoint(CompanyTollPointReqVo req) {
+
+        companyTollPointDao.remove(req);
+    }
+
+}

src/main/java/com/pangding/web/authority/service/impl/CompanyMsgServiceImpl.java

@@ -17,6 +17,7 @@ import com.pangding.web.vo.system.req.authority.UserReqVo;
 import com.pangding.web.vo.system.res.CompanyMsgResVo;
 import com.pangding.web.vo.system.res.DeviceResVo;
 import com.pangding.web.vo.system.res.authority.UserResVo;
+import com.yanzuoguang.util.helper.JsonHelper;
 import com.yanzuoguang.util.helper.StringHelper;
 import com.yanzuoguang.util.vo.PageSizeData;
 import com.yanzuoguang.util.vo.ResponseResult;
@@ -54,7 +55,9 @@ public class CompanyMsgServiceImpl implements CompanyMsgService {
         DeviceReqVo deviceReqVo = new DeviceReqVo();
         deviceReqVo.setCompanyId(reqVo.getCompanyId());
         deviceReqVo.setDeviceType(CompanyConstant.DEVICE_SOUND);
+        deviceReqVo.setTollPoint(reqVo.getExtendInfo());
         DeviceResVo deviceResVo = deviceDao.load(deviceReqVo, DeviceResVo.class);
+        System.out.println("请求参数：" + JsonHelper.serialize(deviceReqVo) + ",查询结果：" + JsonHelper.serialize(deviceResVo));
         if (!StringHelper.isEmpty(deviceResVo)) {
             String deviceCode = deviceResVo.getDeviceCode();
             String deviceName = deviceResVo.getDeviceName();

src/main/java/com/pangding/web/authority/service/impl/FinanceServiceImpl.java

@@ -473,7 +473,6 @@ public class FinanceServiceImpl implements FinanceService {
             // 退款
             money = -money;
         }
-        System.out.println("money:" + money);
         if(StringHelper.isEmpty(money)){
             throw new CodeException("金额不能为空");
         }
@@ -481,7 +480,6 @@ public class FinanceServiceImpl implements FinanceService {
         UpdateCompanyMoneyReqVo updateCompanyMoneyReqVo = new UpdateCompanyMoneyReqVo();
         updateCompanyMoneyReqVo.setCompanyId(req.getCompanyId());
         updateCompanyMoneyReqVo.setNewWithdrawTotalCash(money);
-        System.out.println("update:" + JsonHelper.serialize(updateCompanyMoneyReqVo));
         companyExtendDao.updateCompanyMoney(updateCompanyMoneyReqVo);
 
         CompanyResVo companyVo = companyDao.load(req.getCompanyId(), CompanyResVo.class);