提交代码

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 @Override
public void invoke(ImportCompleteGasOrderReceiptModel model, AnalysisContext analysisContext) { public void invoke(ImportCompleteGasOrderReceiptModel model, AnalysisContext analysisContext) {
if (StringUtils.isBlank(model.getApplyNo())) { if (StringUtils.isNotBlank(model.getOrderNo())) {
model.setErrorMessage("请填写申请单号"); // 订单开票
errorData.add(model); BsGasOrderReceipt receipt = gasOrderReceiptService.getDetailByOrderNo(model.getOrderNo().trim(),GasOrderReceiptStatusEnum.status1);
return; 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 @Override
public void doAfterAllAnalysed(AnalysisContext analysisContext) { public void doAfterAllAnalysed(AnalysisContext analysisContext) {
if (!successData.isEmpty()) { if (!successData.isEmpty()) {
gasOrderReceiptService.batchInsert(successData); gasOrderReceiptService.batchUpdate(successData);
} }
this.successData.clear(); this.successData.clear();
} }

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

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

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

@ -52,8 +52,8 @@ public class BsGasOrderReceiptServiceImpl implements BsGasOrderReceiptService {
} }
@Override @Override
public void batchInsert(List<BsGasOrderReceipt> data) { public void batchUpdate(List<BsGasOrderReceipt> data) {
gasOrderReceiptMapper.batchInsert(data); gasOrderReceiptMapper.batchUpdate(data);
} }
@Override @Override
@ -156,6 +156,21 @@ public class BsGasOrderReceiptServiceImpl implements BsGasOrderReceiptService {
return null; 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 @Override
public BsGasOrderReceipt getDetail(Long orderReceiptId) { public BsGasOrderReceipt getDetail(Long orderReceiptId) {
return gasOrderReceiptMapper.selectByPrimaryKey(orderReceiptId); return gasOrderReceiptMapper.selectByPrimaryKey(orderReceiptId);

Loading…
Cancel
Save