提交代码

master
胡锐 1 week ago
parent 212e6721fe
commit 2324c28097
  1. 30
      bweb/src/main/java/com/bweb/excel/listener/ImportCompleteGasOrderReceiptListener.java
  2. 4
      bweb/src/main/java/com/bweb/excel/model/ImportCompleteGasOrderReceiptModel.java
  3. 72
      service/src/main/java/com/hfkj/dao/BsGasOrderReceiptMapperExt.java
  4. 11
      service/src/main/java/com/hfkj/service/gas/BsGasOrderReceiptService.java
  5. 19
      service/src/main/java/com/hfkj/service/gas/impl/BsGasOrderReceiptServiceImpl.java

@ -28,25 +28,17 @@ public class ImportCompleteGasOrderReceiptListener extends AnalysisEventListener
**/
@Override
public void invoke(ImportCompleteGasOrderReceiptModel model, AnalysisContext analysisContext) {
if (StringUtils.isBlank(model.getApplyNo())) {
model.setErrorMessage("请填写申请单号");
errorData.add(model);
return;
if (StringUtils.isNotBlank(model.getOrderNo())) {
// 订单开票
BsGasOrderReceipt receipt = gasOrderReceiptService.getDetailByOrderNo(model.getOrderNo().trim(),GasOrderReceiptStatusEnum.status1);
if (receipt == null) {
//model.setErrorMessage("未找到交易单号开票申请数据");
//errorData.add(model);
return;
}
receipt.setStatus(GasOrderReceiptStatusEnum.status2.getStatus());
successData.add(receipt);
}
// 订单开票
BsGasOrderReceipt receipt = gasOrderReceiptService.getDetail(model.getApplyNo());
if (receipt == null) {
model.setErrorMessage("未找到申请单号数据");
errorData.add(model);
return;
}
if (!receipt.getStatus().equals(GasOrderReceiptStatusEnum.status1.getStatus())) {
model.setErrorMessage("开票不处于待开票状态");
errorData.add(model);
return;
}
receipt.setStatus(GasOrderReceiptStatusEnum.status2.getStatus());
successData.add(receipt);
}
/**
@ -57,7 +49,7 @@ public class ImportCompleteGasOrderReceiptListener extends AnalysisEventListener
@Override
public void doAfterAllAnalysed(AnalysisContext analysisContext) {
if (!successData.isEmpty()) {
gasOrderReceiptService.batchInsert(successData);
gasOrderReceiptService.batchUpdate(successData);
}
this.successData.clear();
}

@ -10,8 +10,8 @@ import lombok.Data;
@Data
public class ImportCompleteGasOrderReceiptModel {
@ExcelProperty("申请单号")
private String applyNo;
@ExcelProperty("交易单号")
private String orderNo;
/**
* 错误消息
*/

@ -4,6 +4,7 @@ import com.hfkj.entity.BsGasOrderReceipt;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Options;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;
import java.util.List;
@ -12,49 +13,36 @@ import java.util.List;
*/
public interface BsGasOrderReceiptMapperExt {
@Insert({
@Update({
"<script>" +
" insert into bs_gas_order_receipt (apply_no, user_receipt_id, ",
" company_name, tax_no, ",
" contacts_phone, email, ",
" agent_id, agent_name, ",
" agent_staff_id, agent_staff_name, ",
" mer_no, mer_name, ",
" order_no, order_child_no, ",
" oil_no, amount, `status`, ",
" fail_remark, create_time, ",
" update_time, ext_1, ",
" ext_2, ext_3)",
" values " +
" <foreach collection='list' item='item' index='index' separator=','>" +
" (" +
" #{item.applyNo,jdbcType=VARCHAR}, " +
" #{item.userReceiptId,jdbcType=BIGINT}, ",
" #{item.companyName,jdbcType=VARCHAR}," +
" #{item.taxNo,jdbcType=VARCHAR}, ",
" #{item.contactsPhone,jdbcType=VARCHAR}," +
" #{item.email,jdbcType=VARCHAR}, ",
" #{item.agentId,jdbcType=BIGINT}, " +
" #{item.agentName,jdbcType=VARCHAR}, ",
" #{item.agentStaffId,jdbcType=BIGINT}," +
" #{item.agentStaffName,jdbcType=VARCHAR}, ",
" #{item.merNo,jdbcType=VARCHAR}, " +
" #{item.merName,jdbcType=VARCHAR}, ",
" #{item.orderNo,jdbcType=VARCHAR}, " +
" #{item.orderChildNo,jdbcType=VARCHAR}, ",
" #{item.oilNo,jdbcType=VARCHAR}," +
" #{item.amount,jdbcType=DECIMAL}, " +
" #{item.status,jdbcType=INTEGER}, ",
" #{item.failRemark,jdbcType=VARCHAR}," +
" #{item.createTime,jdbcType=TIMESTAMP}, ",
" #{item.updateTime,jdbcType=TIMESTAMP}," +
" #{item.ext1,jdbcType=VARCHAR}, ",
" #{item.ext2,jdbcType=VARCHAR}," +
" #{item.ext3,jdbcType=VARCHAR}" +
" )" +
" </foreach>" +
"<foreach collection='list' item='item' separator=';'>",
" update bs_gas_order_receipt",
" set apply_no = #{item.applyNo,jdbcType=VARCHAR},",
" user_receipt_id = #{item.userReceiptId,jdbcType=BIGINT},",
" company_name = #{item.companyName,jdbcType=VARCHAR},",
" tax_no = #{item.taxNo,jdbcType=VARCHAR},",
" contacts_phone = #{item.contactsPhone,jdbcType=VARCHAR},",
" email = #{item.email,jdbcType=VARCHAR},",
" agent_id = #{item.agentId,jdbcType=BIGINT},",
" agent_name = #{item.agentName,jdbcType=VARCHAR},",
" agent_staff_id = #{item.agentStaffId,jdbcType=BIGINT},",
" agent_staff_name = #{item.agentStaffName,jdbcType=VARCHAR},",
" mer_no = #{item.merNo,jdbcType=VARCHAR},",
" mer_name = #{item.merName,jdbcType=VARCHAR},",
" order_no = #{item.orderNo,jdbcType=VARCHAR},",
" order_child_no = #{item.orderChildNo,jdbcType=VARCHAR},",
" oil_no = #{item.oilNo,jdbcType=VARCHAR},",
" amount = #{item.amount,jdbcType=DECIMAL},",
" `status` = #{item.status,jdbcType=INTEGER},",
" fail_remark = #{item.failRemark,jdbcType=VARCHAR},",
" create_time = #{item.createTime,jdbcType=TIMESTAMP},",
" update_time = #{item.updateTime,jdbcType=TIMESTAMP},",
" ext_1 = #{item.ext1,jdbcType=VARCHAR},",
" ext_2 = #{item.ext2,jdbcType=VARCHAR},",
" ext_3 = #{item.ext3,jdbcType=VARCHAR}",
" where id = #{item.id,jdbcType=BIGINT}",
"</foreach>",
"</script>"
})
@Options(useGeneratedKeys=true, keyProperty="id")
void batchInsert(@Param("list") List<BsGasOrderReceipt> data);
void batchUpdate(@Param("list") List<BsGasOrderReceipt> data);
}

@ -1,6 +1,7 @@
package com.hfkj.service.gas;
import com.hfkj.entity.BsGasOrderReceipt;
import com.hfkj.sysenum.gas.GasOrderReceiptStatusEnum;
import java.util.List;
import java.util.Map;
@ -22,7 +23,7 @@ public interface BsGasOrderReceiptService {
* 批量导入
* @param data
*/
void batchInsert(List<BsGasOrderReceipt> data);
void batchUpdate(List<BsGasOrderReceipt> data);
/**
* 申请
@ -50,6 +51,14 @@ public interface BsGasOrderReceiptService {
*/
BsGasOrderReceipt getDetail(String applyNo);
/**
* 查询详情
* @param orderNo
* @param status
* @return
*/
BsGasOrderReceipt getDetailByOrderNo(String orderNo, GasOrderReceiptStatusEnum status);
/**
* 查询详情
* @param orderReceiptId

@ -52,8 +52,8 @@ public class BsGasOrderReceiptServiceImpl implements BsGasOrderReceiptService {
}
@Override
public void batchInsert(List<BsGasOrderReceipt> data) {
gasOrderReceiptMapper.batchInsert(data);
public void batchUpdate(List<BsGasOrderReceipt> data) {
gasOrderReceiptMapper.batchUpdate(data);
}
@Override
@ -156,6 +156,21 @@ public class BsGasOrderReceiptServiceImpl implements BsGasOrderReceiptService {
return null;
}
@Override
public BsGasOrderReceipt getDetailByOrderNo(String orderNo, GasOrderReceiptStatusEnum status) {
BsGasOrderReceiptExample example = new BsGasOrderReceiptExample();
BsGasOrderReceiptExample.Criteria criteria = example.createCriteria().andOrderNoEqualTo(orderNo);
if (status != null) {
criteria.andStatusEqualTo(status.getStatus());
}
example.setOrderByClause("create_time desc");
List<BsGasOrderReceipt> list = gasOrderReceiptMapper.selectByExample(example);
if (!list.isEmpty()) {
return list.get(0);
}
return null;
}
@Override
public BsGasOrderReceipt getDetail(Long orderReceiptId) {
return gasOrderReceiptMapper.selectByPrimaryKey(orderReceiptId);

Loading…
Cancel
Save