Merge branch 'master' of http://git.ycjcjy.com/xiangsong/xs-service

src/main/java/com/huiju/estateagents/property/controller/TpTicketController.java

@@ -118,6 +118,14 @@ public class TpTicketController extends BaseController {
     }
 
 
+    @RequestMapping(value = "/admin/updateTicketPrice", method = RequestMethod.POST)
+    public ResponseBean updateTicketPrice(@RequestBody String parameter, HttpServletRequest request){
+        TaUser userElement = getTaUser(request);
+        ResponseBean  responseBean = tpTicketService.updateTicketPrice(parameter,userElement.getUserId(),userElement.getOrgId());
+        return responseBean;
+    }
+
+
     @RequestMapping(value = "/wx/ticketList/{orgId}", method = RequestMethod.GET)
     @ApiOperation(value = "获取 报修/投诉/联系单 各3条数据", notes = "根据 小区编号,第几页,一页多少行")
     @ApiImplicitParams({

src/main/java/com/huiju/estateagents/property/model/TpTicket.java

@@ -98,6 +98,16 @@ public class TpTicket implements Serializable {
      */
     private String updateUser;
 
+    /**
+     * 工单费用
+     */
+    private Integer price;
+
+    /**
+     * 缴费单id
+     */
+    private Integer billInvoiceId;
+
     /**
      * 用户姓名
      */

src/main/java/com/huiju/estateagents/property/service/TpTicketService.java

@@ -139,4 +139,13 @@ public interface TpTicketService extends IService<TpTicket> {
      * @return
      */
     ResponseBean addWxRecordComment(String parameter, String personId, Integer orgId, String userName);
+
+    /**
+     * 添加工单费用
+     * @param parameter
+     * @param userId
+     * @param orgId
+     * @return
+     */
+    ResponseBean updateTicketPrice(String parameter, Integer userId, Integer orgId);
 }

src/main/java/com/huiju/estateagents/property/service/impl/TpTicketServiceImpl.java

@@ -14,9 +14,11 @@ import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.property.common.Constant;
 import com.huiju.estateagents.property.dao.*;
+import com.huiju.estateagents.property.exception.WisdomException;
 import com.huiju.estateagents.property.model.*;
 import com.huiju.estateagents.property.service.TpTicketService;
 import com.huiju.estateagents.property.vo.TpTicketVO;
+import org.apache.commons.lang3.StringUtils;
 import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,6 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.util.*;
 
 /**
@@ -62,6 +65,13 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
 
     @Autowired
     private TaPersonMapper taPersonMapper;
+    /** 缴费项表 **/
+    @Autowired
+    private BillMapper billMapper;
+
+    /** 缴费单 **/
+    @Autowired
+    private BillInvoiceMapper billInvoiceMapper;
 
     @Override
     public ResponseBean ticketLiset(String parameter,Integer orgId) {
@@ -979,4 +989,61 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         response.addSuccess("成功");
         return response;
     }
+
+    /**
+     * 添加工单费用
+     *
+     * @param parameter
+     * @param userId
+     * @param orgId
+     * @return
+     */
+    @Transactional
+    @Override
+    public ResponseBean updateTicketPrice(String parameter, Integer userId, Integer orgId) {
+        TpTicket ticket = JSONObject.parseObject(parameter, TpTicket.class);
+        TpTicket tpTicket = tpTicketMapper.selectById(ticket.getId());
+
+        // 新建缴费项
+        Bill bill = new Bill();
+        bill.setBillName(tpTicket.getTicketTitle());
+        bill.setBillExplain(tpTicket.getTicketContent());
+        bill.setEndDate(Date.from(LocalDateTime.now().plusMonths(1).atZone( ZoneId.systemDefault()).toInstant()));
+        bill.setPayPrice(ticket.getPrice().toString());
+
+        bill.setPayedNum(0);
+        bill.setBillStatus("0");
+        bill.setCreateDate(new Date());
+        bill.setCreateUser(userId);
+        bill.setOrgId(orgId);
+        bill.setPayTotalNum(ticket.getPrice());
+        bill.setUnpayedNum(ticket.getPrice());
+        billMapper.insert(bill);
+
+        // 新增缴费单
+        BillInvoice billInvoice = new BillInvoice();
+        billInvoice.setOrgId(orgId);
+        billInvoice.setBillId(bill.getId());
+
+        // 获取房间号
+        QueryWrapper<TaUserVerify> taUserVerifyQueryWrapper = new QueryWrapper<>();
+        taUserVerifyQueryWrapper.eq("verify_status","0");
+        taUserVerifyQueryWrapper.eq("person_id",tpTicket.getPersonId());
+        List<TaUserVerify> userVerifyList = taUserVerifyMapper.selectList(taUserVerifyQueryWrapper);
+        billInvoice.setRoomNoId(userVerifyList.get(0).getRoomNoId());
+        billInvoice.setBillInvoiceExplain(bill.getBillExplain());
+        billInvoice.setPayPrice(Integer.valueOf(bill.getPayPrice()));
+        billInvoice.setBillStatus("0");
+        billInvoice.setCreateUser(userId);
+        billInvoice.setCreateDate(new Date());
+        billInvoice.setStatus(1);
+
+        billInvoiceMapper.insert(billInvoice);
+
+        // 返更新ticket
+        tpTicket.setPrice(ticket.getPrice());
+        tpTicket.setBillInvoiceId(billInvoice.getId());
+        tpTicketMapper.updateById(tpTicket);
+        return ResponseBean.success(tpTicket);
+    }
 }